e800072c18
In netdevice.h we removed the structure in net-next that is being changes in 'net'. In macsec.c and rtnetlink.c we have overlaps between fixes in 'net' and the u64 attribute changes in 'net-next'. The mlx5 conflicts have to do with vxlan support dependencies. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
netxen | ||
qed | ||
qede | ||
qlcnic | ||
qlge | ||
Kconfig | ||
Makefile | ||
qla3xxx.c | ||
qla3xxx.h |