David S. Miller 6e03f896b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/vxlan.c drivers/vhost/net.c include/linux/if_vlan.h net/core/dev.c The net/core/dev.c conflict was the overlap of one commit marking an existing function static whilst another was adding a new function. In the include/linux/if_vlan.h case, the type used for a local variable was changed in 'net', whereas the function got rewritten to fix a stacked vlan bug in 'net-next'. In drivers/vhost/net.c, Al Viro's iov_iter conversions in 'net-next' overlapped with an endainness fix for VHOST 1.0 in 'net'. In drivers/net/vxlan.c, vxlan_find_vni() added a 'flags' parameter in 'net-next' whereas in 'net' there was a bug fix to pass in the correct network namespace pointer in calls to this function. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-02-05 14:33:28 -08:00
..
3com	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
8390	ne2k-pci: Add pci_disable_device in error handling	2014-12-27 02:20:55 -05:00
adaptec
adi	net: ethernet: adi: drop owner assignment from platform_drivers	2014-10-20 16:21:03 +02:00
aeroflex	net: ethernet: aeroflex: drop owner assignment from platform_drivers	2014-10-20 16:21:03 +02:00
agere
allwinner	net: sun4i-emac: fix error return code	2014-12-31 19:19:00 -05:00
alteon	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
altera	Altera TSE: Add missing phydev	2015-01-02 15:45:10 -05:00
amd	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-02-05 14:33:28 -08:00
apm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-02-05 14:33:28 -08:00
apple	net: ethernet: apple: drop owner assignment from platform_drivers	2014-10-20 16:21:04 +02:00
arc
atheros	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-15 00:53:17 -05:00
broadcom	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
brocade	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
cadence	net: macb: Remove CONFIG_PM ifdef because of compilation warning	2015-01-26 17:26:03 -08:00
calxeda
chelsio	cxgb4: Delete an unnecessary check before the function call "release_firmware"	2015-02-05 00:06:47 -08:00
cirrus	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-02-05 14:33:28 -08:00
cisco	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
davicom	dm9000: Add regulator and reset support to dm9000	2015-01-15 14:08:07 -05:00
dec	net/tulip: don't warn about unknown ARM architecture	2015-02-02 18:53:34 -08:00
dlink
emulex	bridge: add flags argument to ndo_bridge_setlink and ndo_bridge_dellink	2015-02-01 23:16:33 -08:00
faraday	net: ethernet: faraday: drop owner assignment from platform_drivers	2014-10-20 16:21:07 +02:00
freescale	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-02-05 14:33:28 -08:00
fujitsu
hisilicon	net: hip04: add missing MODULE_LICENSE	2015-02-02 18:51:03 -08:00
hp	hp100: fix misspelling of current function in string	2014-12-09 16:18:47 -05:00
i825xx	net: ethernet: i825xx: drop owner assignment from platform_drivers	2014-10-20 16:21:08 +02:00
ibm	IBM-EMAC: Delete an unnecessary check before the function call "of_dev_put"	2015-02-04 20:29:47 -08:00
icplus
intel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-02-05 14:33:28 -08:00
marvell	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
mellanox	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-02-05 14:33:28 -08:00
micrel	ksz884x: Use setup_timer	2014-12-30 18:34:23 -05:00
microchip
moxa	net: ethernet: moxa: drop owner assignment from platform_drivers	2014-10-20 16:21:10 +02:00
myricom	myri10ge: Delete an unnecessary check before the function call "kfree"	2015-02-05 00:25:10 -08:00
natsemi	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
neterion	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
nuvoton	net: ethernet: nuvoton: drop owner assignment from platform_drivers	2014-10-20 16:21:10 +02:00
nvidia	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
nxp
octeon	net: ethernet: octeon: drop owner assignment from platform_drivers	2014-10-20 16:21:11 +02:00
oki-semi
packetengines
pasemi	net-PA Semi: Deletion of unnecessary checks before the function call "pci_dev_put"	2014-12-05 21:14:20 -08:00
qlogic	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-02-05 14:33:28 -08:00
qualcomm	net: qualcomm: Fix dependency	2014-11-11 18:12:32 -05:00
rdc
realtek	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
renesas	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
rocker	net: rocker: Add support for retrieving port level statistics	2015-02-01 23:17:39 -08:00
samsung	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
seeq	net: ethernet: seeq: drop owner assignment from platform_drivers	2014-10-20 16:21:12 +02:00
sfc	ethtool: Support for configurable RSS hash function	2014-12-08 21:07:10 -05:00
sgi	net: ethernet: sgi: drop owner assignment from platform_drivers	2014-10-20 16:21:12 +02:00
silan
sis
smsc	net: smc91x: Add Atari EtherNAT support	2015-01-15 19:32:58 -05:00
stmicro	stmmac: DMA threshold mode or SF mode can be different among multiple device instance	2015-02-01 23:14:24 -08:00
sun	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-02-05 14:33:28 -08:00
tehuti	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
ti	net: ethernet: ti/cpsw-common.c: fix sparse warning	2015-02-05 00:27:49 -08:00
tile	Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2014-10-15 07:48:18 +02:00
toshiba
tundra	net: ethernet: tundra: drop owner assignment from platform_drivers	2014-10-20 16:21:13 +02:00
via	mii: Handle link state changes for forced modes in mii_check_media()	2015-01-19 15:43:42 -05:00
wiznet	Driver core patches for 3.19-rc1	2014-12-14 16:10:09 -08:00
xilinx	net: axienet: fix error return code	2014-12-31 19:19:00 -05:00
xircom
xscale
dnet.c	net: dnet: fix dnet_poll()	2015-01-11 21:44:55 -05:00
dnet.h
ec_bhf.c
ethoc.c	net: ethernet: drop owner assignment from platform_drivers	2014-10-20 16:21:02 +02:00
fealnx.c
jme.c	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
jme.h
Kconfig	net: s6gmac: remove driver	2014-12-22 16:29:03 -05:00
korina.c
lantiq_etop.c	net: ethernet: drop owner assignment from platform_drivers	2014-10-20 16:21:02 +02:00
Makefile	net: s6gmac: remove driver	2014-12-22 16:29:03 -05:00
netx-eth.c	net: ethernet: drop owner assignment from platform_drivers	2014-10-20 16:21:02 +02:00