WSL2-Linux-Kernel/drivers/net/ethernet/hisilicon
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
..
hns ethernet: constify references to netdev->dev_addr in drivers 2021-10-14 09:22:11 -07:00
hns3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-10-28 10:43:58 -07:00
Kconfig ethernet: fix PTP_1588_CLOCK dependencies 2021-08-13 17:49:05 -07:00
Makefile
hip04_eth.c ethernet: make use of eth_hw_addr_random() where appropriate 2021-10-14 09:22:15 -07:00
hisi_femac.c ethernet: constify references to netdev->dev_addr in drivers 2021-10-14 09:22:11 -07:00
hix5hd2_gmac.c ethernet: constify references to netdev->dev_addr in drivers 2021-10-14 09:22:11 -07:00
hns_mdio.c net: hns: Fix spelling mistake "maped" -> "mapped" 2021-09-27 12:21:16 +01:00