WSL2-Linux-Kernel/drivers/net/ethernet/8390
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
..
8390.c netdev: pass the stuck queue to the timeout handler 2019-12-12 21:38:57 -08:00
8390.h 8390: Fix coding-style issues 2020-06-28 21:44:49 -07:00
8390p.c netdev: pass the stuck queue to the timeout handler 2019-12-12 21:38:57 -08:00
Kconfig treewide: replace '---help---' in Kconfig files with 'help' 2020-06-14 01:57:21 +09:00
Makefile net-next: New ax88796 platform driver for Amiga X-Surf 100 Zorro board (m68k) 2018-04-19 16:11:11 -04:00
apne.c ethernet: Use octal not symbolic permissions 2018-03-26 12:07:49 -04:00
ax88796.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
axnet_cs.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-09-04 21:28:59 -07:00
etherh.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
hydra.c net/8390: Fix msg_enable patch snafu 2018-02-21 14:14:04 -05:00
lib8390.c 8390: Avoid comma separated statements 2020-08-25 07:54:19 -07:00
mac8390.c mac8390: Fix mmio access size probe 2019-03-18 16:56:57 -07:00
mcf8390.c net/8390: Fix msg_enable patch snafu 2018-02-21 14:14:04 -05:00
ne.c net: 8390: ne: Fix accidentally removed RBTX4927 support 2018-05-16 14:38:54 -04:00
ne2k-pci.c ne2k-pci: Use netif_msg_init to initialize msg_enable bits 2020-07-17 19:04:06 -07:00
pcnet_cs.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-09-04 21:28:59 -07:00
smc-ultra.c ethernet: Use octal not symbolic permissions 2018-03-26 12:07:49 -04:00
stnic.c ethernet: Use octal not symbolic permissions 2018-03-26 12:07:49 -04:00
wd.c ethernet: Use octal not symbolic permissions 2018-03-26 12:07:49 -04:00
xsurf100.c net-next: New ax88796 platform driver for Amiga X-Surf 100 Zorro board (m68k) 2018-04-19 16:11:11 -04:00
zorro8390.c net/8390: Fix msg_enable patch snafu 2018-02-21 14:14:04 -05:00