![]() Conflicts: drivers/net/wireless/ath/ath9k/recv.c drivers/net/wireless/mwifiex/pcie.c net/ipv6/sit.c The SIT driver conflict consists of a bug fix being done by hand in 'net' (missing u64_stats_init()) whilst in 'net-next' a helper was created (netdev_alloc_pcpu_stats()) which takes care of this. The two wireless conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
hsr_device.c | ||
hsr_device.h | ||
hsr_framereg.c | ||
hsr_framereg.h | ||
hsr_main.c | ||
hsr_main.h | ||
hsr_netlink.c | ||
hsr_netlink.h | ||
Kconfig | ||
Makefile |