linux_dsm_epyc7002/drivers/net/ethernet/amd
David S. Miller 0fa74a4be4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/emulex/benet/be_main.c
	net/core/sysctl_net_core.c
	net/ipv4/inet_diag.c

The be_main.c conflict resolution was really tricky.  The conflict
hunks generated by GIT were very unhelpful, to say the least.  It
split functions in half and moved them around, when the real actual
conflict only existed solely inside of one function, that being
be_map_pci_bars().

So instead, to resolve this, I checked out be_main.c from the top
of net-next, then I applied the be_main.c changes from 'net' since
the last time I merged.  And this worked beautifully.

The inet_diag.c and sysctl_net_core.c conflicts were simple
overlapping changes, and were easily to resolve.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-03-20 18:51:09 -04:00
..
xgbe amd-xgbe: Use napi_alloc_skb when allocating skb in softirq 2015-03-20 16:33:57 -04:00
7990.c
7990.h
a2065.c
a2065.h
am79c961a.c
am79c961a.h
amd8111e.c ethernet: codespell comment spelling fixes 2015-03-08 22:54:22 -04:00
amd8111e.h ethernet: codespell comment spelling fixes 2015-03-08 22:54:22 -04:00
ariadne.c
ariadne.h
atarilance.c net: atarilance: Remove obsolete IRQ_TYPE_PRIO 2015-01-15 13:44:50 +01:00
au1000_eth.c net: ethernet: amd: drop owner assignment from platform_drivers 2014-10-20 16:21:04 +02:00
au1000_eth.h
declance.c declance: Fix 64-bit compilation warnings 2014-07-08 14:04:30 -07:00
hplance.c hplance: fix ram size in comment 2014-06-05 15:14:21 -07:00
hplance.h
Kconfig Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-02-05 14:33:28 -08:00
lance.c
Makefile amd-xgbe: Configuration and build support 2014-06-05 15:26:51 -07:00
mvme147.c mvme147: fix ram size in comment 2014-06-05 15:14:21 -07:00
ni65.c
ni65.h
nmclan_cs.c net: am2150: fix nmclan_cs.c shared interrupt handling 2015-01-29 15:08:21 -08:00
pcnet32.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-03-20 18:51:09 -04:00
sun3lance.c
sunlance.c net: ethernet: amd: drop owner assignment from platform_drivers 2014-10-20 16:21:04 +02:00