2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-15 08:44:14 +08:00
linux-next/drivers/net/ethernet/realtek
Jakub Kicinski 7df621a3ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
include/net/sock.h
  7b50ecfcc6 ("net: Rename ->stream_memory_read to ->sock_is_readable")
  4c1e34c0db ("vsock: Enable y2038 safe timeval for timeout")

drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
  0daa55d033 ("octeontx2-af: cn10k: debugfs for dumping LMTST map table")
  e77bcdd1f6 ("octeontx2-af: Display all enabled PF VF rsrc_alloc entries.")

Adjacent code addition in both cases, keep both.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2021-10-28 10:43:58 -07:00
..
8139cp.c ethernet: replace netdev->dev_addr 16bit writes 2021-10-14 09:22:27 -07:00
8139too.c ethernet: replace netdev->dev_addr 16bit writes 2021-10-14 09:22:27 -07:00
atp.c ethernet: replace netdev->dev_addr 16bit writes 2021-10-14 09:22:27 -07:00
atp.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
Kconfig treewide: replace '---help---' in Kconfig files with 'help' 2020-06-14 01:57:21 +09:00
Makefile r8169: factor out PHY configuration to r8169_phy_config.c 2020-01-10 16:41:35 -08:00
r8169_firmware.c treewide: Use sizeof_field() macro 2019-12-09 10:36:44 -08:00
r8169_firmware.h r8169: factor out firmware handling 2019-06-05 11:41:59 -07:00
r8169_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-10-28 10:43:58 -07:00
r8169_phy_config.c r8169: remove support for chip version RTL_GIGA_MAC_VER_27 2021-09-14 14:13:58 +01:00
r8169.h r8169: remove support for chip version RTL_GIGA_MAC_VER_27 2021-09-14 14:13:58 +01:00