David S. Miller 26440c835f 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>

2015-10-20 06:08:27 -07:00

..

appletalk

…

arcnet

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-09-26 16:08:27 -07:00

bonding

bonding: support encapsulated ipv6 TSO

2015-10-15 23:29:28 -07:00

caif

net: caif: convert to using IFF_NO_QUEUE

2015-08-18 11:55:07 -07:00

can

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-10-20 06:08:27 -07:00

cris

…

dsa

net: dsa: mv88e6xxx: fix hardware bridging

2015-10-13 04:26:31 -07:00

ethernet

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-10-20 06:08:27 -07:00

fddi

net/fddi: remove HWM_REVERSE() macro

2015-08-13 21:12:17 -07:00

fjes

drivers/net: get rid of unnecessary initializations in .get_drvinfo()

2015-10-16 00:24:10 -07:00

hamradio

Merge branch 'x86/urgent' into x86/asm to fix up conflicts and to pick up fixes

2015-08-18 09:39:47 +02:00

hippi

…

hyperv

flow_dissector: Add flags argument to skb_flow_dissector functions

2015-09-01 15:06:22 -07:00

ieee802154

mrf24j40: remove trailing semicolon

2015-09-24 20:39:37 +02:00

ipvlan

ipv4, ipv6: Pass net into ip_local_out and ip6_local_out

2015-10-08 04:27:02 -07:00

irda

net: irda: pxaficp_ir: dmaengine conversion

2015-09-28 22:32:48 -07:00

phy

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-10-20 06:08:27 -07:00

plip

…

ppp

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-10-20 06:08:27 -07:00

slip

…

team

net: team: convert to using IFF_NO_QUEUE

2015-08-18 11:55:05 -07:00

usb

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-10-20 06:08:27 -07:00

vmxnet3

drivers/net: get rid of unnecessary initializations in .get_drvinfo()

2015-10-16 00:24:10 -07:00

wan

net: wan: sbni: fix device usage count

2015-09-05 17:32:53 -07:00

wimax

…

wireless

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-10-20 06:08:27 -07:00

xen-netback

xen-netback: correctly check failed allocation

2015-10-18 19:37:29 -07:00

dummy.c

net: dummy: convert to using IFF_NO_QUEUE

2015-08-18 11:55:05 -07:00

eql.c

…

geneve.c

tunnels: Don't require remote endpoint or ID during creation.

2015-10-18 22:44:10 -07:00

ifb.c

ifb: add multiqueue operation

2015-07-08 16:00:09 -07:00

Kconfig

net: Add IPv6 support to VRF device

2015-10-13 04:55:07 -07:00

LICENSE.SRC

…

loopback.c

net: loopback: convert to using IFF_NO_QUEUE

2015-08-18 11:55:05 -07:00

macvlan.c

ipv4: Pass struct net into ip_defrag and ip_check_defrag

2015-10-12 19:44:16 -07:00

macvtap.c

macvtap: fix TUNSETSNDBUF values > 64k

2015-09-20 22:44:39 -07:00

Makefile

fjes: Introduce FUJITSU Extended Socket Network Device driver

2015-08-24 14:06:33 -07:00

mdio.c

…

mii.c

…

netconsole.c

netconsole: implement extended console support

2015-06-25 17:00:39 -07:00

nlmon.c

net: nlmon: convert to using IFF_NO_QUEUE

2015-08-18 11:55:05 -07:00

ntb_netdev.c

NTB: Add flow control to the ntb_netdev

2015-09-07 15:17:08 -04:00

rionet.c

bus: subsys: update return type of ->remove_dev() to void

2015-08-05 17:08:14 -07:00

sb1000.c

…

Space.c

…

sungem_phy.c

…

tun.c

tun: use sk_fullsock() before reading sk->sk_tsflags

2015-10-12 19:45:48 -07:00

veth.c

net: veth: enable noqueue operation by default

2015-08-18 11:55:04 -07:00

virtio_net.c

virtio-net: avoid unnecessary sg initialzation

2015-08-27 15:51:45 -07:00

vrf.c

net: Add IPv6 support to VRF device

2015-10-13 04:55:07 -07:00

vxlan.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-10-20 06:08:27 -07:00

xen-netfront.c

xen-netfront: always set num queues if possible

2015-09-20 21:39:21 -07:00