| commit | 26440c835f8b1a491e2704118ac55bf87334366c | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Oct 20 06:08:27 2015 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Tue Oct 20 06:08:27 2015 -0700 |
| tree | 3c2d23b59fd49b252fdbf6c09efc41b354933fc6 | |
| parent | 371f1c7e0d854796adc622cc3bacfcc5fc638db1 [diff] | |
| parent | 1099f86044111e9a7807f09523e42d4c9d0fb781 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 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>