mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-05 13:46:39 +07:00
9d367eddf3
Conflicts: drivers/net/bonding/bond_main.c drivers/net/ethernet/mellanox/mlxsw/spectrum.h drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c The bond_main.c and mellanox switch conflicts were cases of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
act2000 | ||
capi | ||
divert | ||
gigaset | ||
hardware | ||
hisax | ||
hysdn | ||
i4l | ||
icn | ||
isdnloop | ||
mISDN | ||
pcbit | ||
Kconfig | ||
Makefile |