Conflicts: drivers/net/usb/asix_common.c net/ipv4/inet_connection_sock.c net/switchdev/switchdev.c In the inet_connection_sock.c case the request socket hashing scheme is completely different in net-next. The other two conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
asm-generic | ||
drm | ||
linux | ||
misc | ||
mtd | ||
rdma | ||
scsi | ||
sound | ||
video | ||
xen | ||
Kbuild |