David S. Miller 4963ed48f2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	net/ipv4/arp.c

The net/ipv4/arp.c conflict was one commit adding a new
local variable while another commit was deleting one.

Signed-off-by: David S. Miller <davem@davemloft.net>

2015-09-26 16: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: use l4 hash if available

2015-09-17 21:01:05 -07:00

caif

net: caif: convert to using IFF_NO_QUEUE

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

can

can: flexcan: enable interrupts atomically at the end of flexcan_chip_start()

2015-09-21 08:38:23 +02:00

cris

…

dsa

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

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

ethernet

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

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

fddi

net/fddi: remove HWM_REVERSE() macro

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

fjes

fjes: fix off-by-one error at fjes_hw_update_zone_task()

2015-09-17 22:34:09 -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

drivers/net/ieee802154/at86rf230.c: seq_printf() now returns NULL

2015-09-21 20:41:44 -07:00

ipvlan

net: ipvlan: convert to using IFF_NO_QUEUE

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

irda

irda: ali-ircc: Fix deadlock in ali_ircc_sir_change_speed()

2015-09-11 16:18:33 -07:00

phy

net: update docbook comment for __mdiobus_register()

2015-09-25 21:37:19 -07:00

plip

…

ppp

ppp: fix lockdep splat in ppp_dev_uninit()

2015-09-25 12:38:11 -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-09-26 16:08:27 -07:00

vmxnet3

Driver: Vmxnet3: Extend register dump support

2015-09-23 15:06:27 -07:00

wan

net: wan: sbni: fix device usage count

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

wimax

…

wireless

genetlink: simplify genl_notify

2015-09-24 12:25:23 -07:00

xen-netback

Merge tag 'for-linus-4.3-rc0b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2015-09-10 16:21:11 -07:00

dummy.c

net: dummy: convert to using IFF_NO_QUEUE

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

eql.c

…

geneve.c

geneve: use network byte order for destination port config parameter

2015-09-23 15:41:04 -07:00

ifb.c

ifb: add multiqueue operation

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

Kconfig

geneve: Consolidate Geneve functionality in single module.

2015-08-27 15:42:48 -07:00

LICENSE.SRC

…

loopback.c

net: loopback: convert to using IFF_NO_QUEUE

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

macvlan.c

macvlan: Don't segment multiple tagged packets on macvlan device

2015-08-03 14:24:49 -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

tuntap: Don't segment multiple tagged packets on tap device

2015-08-03 14:24:50 -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

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

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

vxlan.c

vxlan: reject IPv6 addresses if IPv6 is not configured

2015-09-17 22:32:15 -07:00

xen-netfront.c

xen-netfront: always set num queues if possible

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