• David S. Miller's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 9f0d34bc
    David S. Miller authored
    Conflicts:
    	drivers/net/usb/asix_common.c
    	drivers/net/usb/sr9800.c
    	drivers/net/usb/usbnet.c
    	include/linux/usb/usbnet.h
    	net/ipv4/tcp_ipv4.c
    	net/ipv6/tcp_ipv6.c
    
    The TCP conflicts were overlapping changes.  In 'net' we added a
    READ_ONCE() to the socket cached RX route read, whilst in 'net-next'
    Eric Dumazet touched the surrounding code dealing with how mini
    sockets are handled.
    
    With USB, it's a case of the same bug fix first going into net-next
    and then I cherry picked it back into net.
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    9f0d34bc
Name
Last commit
Last update
..
cgroup Loading commit data...
firewire Loading commit data...
hv Loading commit data...
include Loading commit data...
lguest Loading commit data...
lib Loading commit data...
net Loading commit data...
nfsd Loading commit data...
perf Loading commit data...
power Loading commit data...
scripts Loading commit data...
testing Loading commit data...
thermal/tmon Loading commit data...
time Loading commit data...
usb Loading commit data...
virtio Loading commit data...
vm Loading commit data...
Makefile Loading commit data...