mirror
/
linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
linux/drivers/net/ethernet/microchip
History
Jakub Kicinski e52f7c1ddf Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
Merge in the left-over fixes before the net-next pull-request.

Conflicts:

drivers/net/ethernet/mediatek/mtk_ppe.c
  ae3ed15da5 ("net: ethernet: mtk_eth_soc: fix state in __mtk_foe_entry_clear")
  9d8cb4c096 ("net: ethernet: mtk_eth_soc: add foe_entry_size to mtk_eth_soc")
https://lore.kernel.org/all/6cb6893b-4921-a068-4c30-1109795110bb@tessares.net/

kernel/bpf/helpers.c
  8addbfc7b3 ("bpf: Gate dynptr API behind CAP_BPF")
  5679ff2f13 ("bpf: Move bpf_loop and bpf_for_each_map_elem under CAP_BPF")
  8a67f2de9b ("bpf: expose bpf_strtol and bpf_strtoul to all program types")
https://lore.kernel.org/all/20221003201957.13149-1-daniel@iogearbox.net/

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 		2022-10-03 17:44:18 -07:00
..
lan966x net: lan966x: Fix return type of lan966x_port_xmit 2022-10-03 16:40:16 -07:00
sparx5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2022-10-03 17:44:18 -07:00
Kconfig net: lan966x: add the basic lan966x driver 2021-11-29 12:58:38 +00:00
Makefile net: lan966x: add the basic lan966x driver 2021-11-29 12:58:38 +00:00
enc28j60.c net: ethernet: move from strlcpy with unused retval to strscpy 2022-08-31 14:11:26 -07:00
enc28j60_hw.h
…
encx24j600-regmap.c net: encx24j600: check error in devm_regmap_init_encx24j600 2021-10-13 15:25:25 -07:00
encx24j600.c net: ethernet: move from strlcpy with unused retval to strscpy 2022-08-31 14:11:26 -07:00
encx24j600_hw.h net: encx24j600: check error in devm_regmap_init_encx24j600 2021-10-13 15:25:25 -07:00
lan743x_ethtool.c net: ethernet: move from strlcpy with unused retval to strscpy 2022-08-31 14:11:26 -07:00
lan743x_ethtool.h net: lan743x: Add support to LAN743x register dump 2022-06-16 20:45:48 -07:00
lan743x_main.c net: drop the weight argument from netif_napi_add 2022-09-28 18:57:14 -07:00
lan743x_main.h net: lan743x: Add support for Rx IP & TCP checksum offload 2022-09-09 08:20:58 +01:00
lan743x_ptp.c eth: lan743x: reject extts for non-pci11x1x devices 2022-10-03 12:39:39 +01:00
lan743x_ptp.h net: lan743x: Add support for PTP-IO Event Output (Periodic Output) 2022-03-18 12:53:23 +00:00