Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-11-05--00-00 (v6.12-rc5-1290-g1ca896815431) remotes/brancher/net-next-2024-11-05--03-00 (v6.12-rc5-1279-gae96ae05fe41) ==== BASE DIFF ==== Documentation/networking/j1939.rst | 2 +- drivers/net/can/c_can/c_can_main.c | 7 ++- drivers/net/can/cc770/Kconfig | 2 +- drivers/net/can/m_can/m_can.c | 3 +- drivers/net/can/rockchip/Kconfig | 3 +- drivers/net/can/sja1000/Kconfig | 2 +- drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c | 8 +-- drivers/net/can/spi/mcp251xfd/mcp251xfd-tef.c | 10 ++-- drivers/net/ethernet/amazon/ena/ena_com.c | 58 ++------------------- drivers/net/ethernet/amazon/ena/ena_com.h | 32 ------------ drivers/net/ethernet/amazon/ena/ena_ethtool.c | 14 ++--- drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 4 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 59 +--------------------- drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 2 - drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 33 ------------ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 45 ++++------------- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 3 -- .../ethernet/hisilicon/hns3/hns3pf/hclge_regs.c | 9 ++-- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 40 +++------------ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.c | 9 ++-- drivers/ptp/Kconfig | 6 ++- include/linux/tcp.h | 3 +- include/uapi/linux/dpll.h | 14 ++--- tools/net/ynl/lib/nlspec.py | 3 ++ tools/net/ynl/ynl-gen-c.py | 14 +++-- 25 files changed, 86 insertions(+), 299 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.mN7P06ANIl b/tmp/tmp.rphdiN0IRn index 2a5953688488..d1ec68f371af 100644 --- a/tmp/tmp.mN7P06ANIl +++ b/tmp/tmp.rphdiN0IRn @@ -4,8 +4,9 @@ fs/9p: use kvzalloc/kvfree to allocate struct p9_rdir and its buffer tc_action dbg profile patch forwarding: set timeout to 3 hours -selftests: rtnetlink: add ipsec packet offload test -xfrm: add SA information to the offloaded packet +net: qrtr: mhi: synchronize qrtr and mhi preparation +selftests: net: add a test for closing a netlink socket ith dump in progress +netlink: terminate outstanding dump on socket close e1000e: Remove Meteor Lake SMBUS workarounds i40e: fix race condition by adding filter's intermediate sync state idpf: fix idpf_vc_core_init error path @@ -14,6 +15,13 @@ ice: change q_index variable type to s16 to store -1 value ice: Fix use after free during unload with ports in bridge r8169: remove leftover locks after reverted change r8169: copy vendor driver 2.5G/5G EEE advertisement constraints +docs: networking: Describe irq suspension +selftests: net: Add busy_poll_test +eventpoll: Control irq suspension for prefer_busy_poll +eventpoll: Trigger napi_busy_loop, if prefer_busy_poll is set +net: Add control functions for irq suspension +net: Suspend softirq when prefer_busy_poll is set +net: Add napi_struct parameter irq_suspend_timeout net: ucc_geth: fix usage with NVMEM MAC address net: ucc_geth: use devm for register_netdev net: ucc_geth: use devm for alloc_etherdev @@ -22,32 +30,9 @@ net: broadcom: use ethtool string helpers net: hisilicon: hns3: use ethtool string helpers net: bnx2x: use ethtool string helpers net: sfc: use ethtool string helpers -can: mcp251xfd: mcp251xfd_get_tef_len(): fix length calculation -can: mcp251xfd: mcp251xfd_ring_alloc(): fix coalescing configuration when switching CAN modes -can: rockchip_canfd: Drop obsolete dependency on COMPILE_TEST -can: rockchip_canfd: CAN_ROCKCHIP_CANFD should depend on ARCH_ROCKCHIP -can: c_can: fix {rx,tx}_errors statistics -can: m_can: m_can_close(): don't call free_irq() for IRQ-less devices -can: {cc770,sja1000}_isa: allow building on x86_64 -can: j1939: fix error in J1939 documentation. -selftests: ncdevmem: Add automated test -selftests: ncdevmem: Move ncdevmem under drivers/net/hw -selftests: ncdevmem: Run selftest when none of the -s or -c has been provided -selftests: ncdevmem: Remove hard-coded queue numbers -selftests: ncdevmem: Use YNL to enable TCP header split -selftests: ncdevmem: Properly reset flow steering -selftests: ncdevmem: Switch to AF_INET6 -selftests: ncdevmem: Remove default arguments -selftests: ncdevmem: Make client_ip optional -selftests: ncdevmem: Unify error handling -selftests: ncdevmem: Separate out dmabuf provider -selftests: ncdevmem: Redirect all non-payload output to stderr -netlink: specs: Add a spec for FIB rule management -netlink: specs: Add a spec for neighbor tables in rtnetlink phonet: do not call synchronize_rcu() from phonet_route_del() selftests: netfilter: nft_queue.sh: fix warnings with socat 1.8.0.0 selftests: netfilter: run conntrack_dump_flush in netns -ipv6: Use local variable for ifa->flags in inet6_fill_ifaddr net: arc: rockchip: fix emac mdio node support net: arc: fix the device for dma_map_single/dma_unmap_single mptcp: remove unneeded lock when listing scheds @@ -55,7 +40,6 @@ Revert "igb: Disable threaded IRQ for igb_msix_other" mptcp: use sock_kfree_s instead of kfree mptcp: no admin perm to list endpoints selftests: net: include lib/sh/*.sh with lib.sh -Fix u32's systematic failure to free IDR entries for hnodes. net: wwan: t7xx: Unify documentation column width net: wwan: t7xx: Add debug ports wwan: core: Add WWAN ADB and MIPC port type @@ -73,21 +57,13 @@ neighbour: Convert iteration to use hlist+macro neighbour: Convert seq_file functions to use hlist neighbour: Define neigh_for_each_in_bucket neighbour: Add hlist_node to struct neighbour -net: ipv4: Cache pmtu for all packet paths if multipath enabled -net: tcp: replace the document for "lsndtime" in tcp_sock net: enetc: Do not configure preemptible TCs if SIs do not support eth: fbnic: Add support to write TCE TCAM entries bnxt_en: replace PTP spinlock with seqlock bnxt_en: cache only 24 bits of hw counter net: stmmac: Add glue layer for T-HEAD TH1520 SoC dt-bindings: net: Add T-HEAD dwmac support -tools: ynl-gen: de-kdocify enums with no doc for entries net: nfc: Propagate ISO14443 type A target ATS to userspace via netlink -net: ena: Add PHC documentation -net: ena: PHC silent reset -net: ena: Add PHC support in the ENA driver -net: ena: Remove deadcode -ptp: Remove 'default y' for VMCLOCK PTP device sfc: Remove more unused functions sfc: Remove unused mcdi functions sfc: Remove unused efx_mae_mport_vf @@ -98,8 +74,6 @@ r8169: improve initialization of RSS registers on RTL8125/RTL8126 dt-bindings: net: snps,dwmac: add support for Arria10 net: stmmac: add support for dwmac 3.72a net: hisilicon: hns: use ethtool string helpers -net: ena: simplify some pointer addition -net: ena: remove devm from ethtool net: stmmac: Fix unbalanced IRQ wake disable warning on single irq case openvswitch: Pass on secpath details for internal port rx. net: phy: respect cached advertising when re-enabling EEE @@ -119,7 +93,6 @@ ipv6: ip6_fib: fix possible null-pointer-dereference in ipv6_route_native_seq_sh selftests: net: really check for bg process completion ipv6: release nexthop on device removal mlx5: only schedule EQ comp tasklet if necessary -chcr_ktls: fix a possible null-pointer dereference in chcr_ktls_dev_add() net: ip: make ip_route_use_hint() return drop reasons net: ip: make ip_mkroute_input/__mkroute_input return drop reasons net: ip: make ip_route_input() return drop reasons