linux/drivers/net/ethernet/marvell
Jakub Kicinski 44a8c4f33c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
We got slightly different patches removing a double word
in a comment in net/ipv4/raw.c - picked the version from net.

Simple conflict in drivers/net/ethernet/ibm/ibmvnic.c. Use cached
values instead of VNIC login response buffer (following what
commit 507ebe6444 ("ibmvnic: Fix use-after-free of VNIC login
response buffer") did).

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2020-09-04 21:28:59 -07:00
..
mvpp2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-09-04 21:28:59 -07:00
octeontx2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-09-04 21:28:59 -07:00
Kconfig mvpp2: use page_pool allocator 2020-07-03 14:46:24 -07:00
Makefile
mv643xx_eth.c net: tso: cache transport header length 2020-06-18 20:46:23 -07:00
mvmdio.c net: mvmdio: avoid error message for optional IRQ 2020-03-17 20:54:37 -07:00
mvneta.c treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00
mvneta_bm.c net: mvneta: use devm_platform_ioremap_resource() to simplify code 2019-08-21 13:52:33 -07:00
mvneta_bm.h net: mvneta: make stub functions static inline 2019-10-25 16:21:48 -07:00
pxa168_eth.c mm: reorder includes after introduction of linux/pgtable.h 2020-06-09 09:39:13 -07:00
skge.c treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00
skge.h PCI: Add constant PCI_STATUS_ERROR_BITS 2020-03-04 14:21:00 -08:00
sky2.c treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00
sky2.h PCI: Add constant PCI_STATUS_ERROR_BITS 2020-03-04 14:21:00 -08:00