Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-10-29--18-00 (v6.12-rc4-1003-g8ad0f9f7a031) remotes/brancher/net-next-2024-10-29--21-00 (v6.12-rc4-1016-ge14c3b07d8d1) ==== BASE DIFF ==== .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 3 + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 4 + drivers/net/gtp.c | 22 +++-- drivers/net/mctp/mctp-i2c.c | 3 + drivers/net/netdevsim/fib.c | 4 +- drivers/net/phy/phylink.c | 102 ++++++++++----------- drivers/net/usb/qmi_wwan.c | 1 + drivers/net/wwan/wwan_core.c | 2 +- include/net/ip_tunnels.h | 2 +- net/core/rtnetlink.c | 2 +- net/ipv4/fib_frontend.c | 2 +- net/ipv4/icmp.c | 2 +- net/ipv4/ip_tunnel.c | 2 +- net/ipv4/ipmr.c | 2 +- net/ipv4/route.c | 2 +- net/sched/cls_api.c | 1 + net/sched/sch_api.c | 2 +- .../selftests/net/netfilter/nft_flowtable.sh | 39 ++++---- .../tc-testing/tc-tests/filters/basic.json | 6 +- .../tc-testing/tc-tests/filters/cgroup.json | 6 +- .../tc-testing/tc-tests/filters/flow.json | 2 +- .../tc-testing/tc-tests/filters/route.json | 2 +- 22 files changed, 114 insertions(+), 99 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.npMUN6NzrF b/tmp/tmp.ZKZdLzj4rz index e8e0c558ee62..5731a749fd7a 100644 --- a/tmp/tmp.npMUN6NzrF +++ b/tmp/tmp.ZKZdLzj4rz @@ -3,6 +3,7 @@ fs/9p: use kvzalloc/kvfree to allocate struct p9_rdir and its buffer tc_action dbg profile patch forwarding: set timeout to 3 hours +sctp: properly validate chunk size in sctp_sf_ootb() net: dpaa_eth: print FD status in CPU endianness in dpaa_eth_fd tracepoint net: wwan: t7xx: Fix off-by-one error in t7xx_dpmaif_rx_buf_alloc() Merge tag 'wireless-2024-10-29' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless @@ -26,6 +27,17 @@ net: hns3: fix missing features due to dev->features configuration too early net: hns3: fixed reset failure issues caused by the incorrect reset type net: hns3: add sync command to sync io-pgtable net: hns3: default enable tx bounce buffer when smmu enabled +tcp: only release congestion control if it has been initialized +net/smc: increase SMC_WR_BUF_CNT +enic: Adjust used MSI-X wq/rq/cq/interrupt resources in a more robust way +enic: Allocate arrays in enic struct based on VIC config +enic: Save resource counts we read from HW +enic: Make MSI-X I/O interrupts come after the other required ones +enic: Create enic_wq/rq structures to bundle per wq/rq data +uapi: net: Avoid -Wflex-array-member-not-at-end warnings +uapi: net: arp: Avoid -Wflex-array-member-not-at-end warnings +uapi: wireless: Avoid -Wflex-array-member-not-at-end warnings +uapi: socket: Introduce struct sockaddr_legacy r8169: fix inconsistent indenting in rtl8169_get_eth_mac_stats r8169: add support for RTL8125D socket: Print pf->create() when it does not clear sock->sk on failure. @@ -39,12 +51,8 @@ selftests: net: lib: Move logging from forwarding/lib.sh here ndo_fdb_del: Shift responsibility for notifying to drivers ndo_fdb_add: Shift responsibility for notifying to drivers net: rtnetlink: Publish rtnl_fdb_notify() -net/sched: stop qdisc_tree_reduce_backlog on TC_H_ROOT -net/mlx5e: Update features on ring size change -net/mlx5e: Update features on MTU change bonding: add ESP offload features when slaves support net: define and implement new SOL_SOCKET SO_RX_IFINDEX option -net: usb: qmi_wwan: add Quectel RG650V net: skip offload for NETIF_F_IPV6_CSUM if ipv6 header contains extension net: phy: dp83822: Configure RMII mode on DP83825 devices selftests: hsr: Add test for VLAN @@ -56,7 +64,6 @@ compiler_types: Add noinline_for_tracing annotation net/smc: use new helper to get the netdev associated to an ibdev net: pse-pd: Add missing of_node_get() before of_find_node_by_name() net: bcmasp: Add missing of_node_get() before of_find_node_by_name() -net: netfilter: Fix use-after-free in get_info() gve: change to use page_pool_put_full_page when recycling pages net: sparx5: add feature support net: sparx5: add compatible string for lan969x @@ -100,9 +107,6 @@ net: dsa: add more extack messages in dsa_user_add_cls_matchall_mirred() net: dsa: use "extack" as argument to flow_action_basic_hw_stats_check() net: dsa: clean up dsa_user_add_cls_matchall() net: sched: propagate "skip_sw" flag to struct flow_cls_common_offload -net: phylink: simplify how SFP PHYs are attached -net: phylink: validate sfp_select_interface() returned interface -net: phylink: add common validation for sfp_select_interface() devlink: remove unused devlink_resource_register() devlink: remove unused devlink_resource_occ_get_register() and _unregister() net: dsa: replace devlink resource registration calls by devl_ variants @@ -111,11 +115,7 @@ devlink: devl_resource_register(): differentiate error codes devlink: use devlink_nl_put_u64() helper devlink: introduce devlink_nl_put_u64() bonding: add ns target multicast address to slave device -ipv4: ip_tunnel: Fix suspicious RCU usage warning in ip_tunnel_find() -igb: Fix potential invalid memory access in igb_init_module() -wwan: core: Pass string literal as format argument of dev_set_name() net: Implement fault injection forcing skb reallocation -net/sched: sch_api: fix xa_insert() error path in tcf_block_get_ext() tcp: add more warn of socket in tcp_send_loss_probe() tcp: add a common helper to debug the underlying issue s390/time: Add PtP driver @@ -128,12 +128,10 @@ rtnetlink: Add netns_atomic flag in rtnl_link_ops rtnetlink: Lookup device in target netns when creating link net: broadcom: use ethtool string helpers amd-xgbe: use ethtool string helpers -rtnetlink: Fix kdoc of rtnl_af_register(). net: fjes: use ethtool string helpers net: mana: use ethtool string helpers ibmvnic: use ethtool string helpers net: bnxt: use ethtool string helpers -netdevsim: Add trailing zero to terminate the string in nsim_nexthop_bucket_activity_write() bnxt_en: add support for device memory tcp net: netmem: add netmem_is_pfmemalloc() helper function net: ethtool: add ring parameter filtering @@ -142,18 +140,8 @@ bnxt_en: add support for header-data-split-thresh ethtool command net: ethtool: add support for configuring header-data-split-thresh bnxt_en: add support for tcp-data-split ethtool command bnxt_en: add support for rx-copybreak ethtool command -net: vertexcom: mse102x: Fix possible double free of TX skb -selftests: netfilter: nft_flowtable.sh: make first pass deterministic -gtp: allow -1 to be specified as file description from userspace -net: phylink: simplify phylink_parse_fixedlink() -mctp i2c: handle NULL header address -ipv4: Prepare ip_rt_get_source() to future .flowi4_tos conversion. -ipv4: Prepare ipmr_rt_fib_lookup() to future .flowi4_tos conversion. -ipv4: Prepare icmp_reply() to future .flowi4_tos conversion. -ipv4: Prepare fib_compute_spec_dst() to future .flowi4_tos conversion. net: wwan: t7xx: reset device if suspend fails net: ftgmac100: refactor getting phy device handle -ipv4: ip_tunnel: Fix suspicious RCU usage warning in ip_tunnel_init_flow() wifi: mac80211: ieee80211_i: Fix memory corruption bug in struct ieee80211_chanctx wifi: iwlwifi: mvm: fix 6 GHz scan construction wifi: cfg80211: clear wdev->cqm_config pointer on free