Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-08-28--12-00 (v6.17-rc2-745-g86b43460021a) remotes/brancher/net-next-2025-08-28--15-00 (v6.17-rc2-777-g87648f9d980a) ==== BASE DIFF ==== .../bindings/net/pse-pd/skyworks,si3474.yaml | 144 +++++ drivers/net/ethernet/meta/fbnic/fbnic_fw.c | 106 ++++ drivers/net/ethernet/meta/fbnic/fbnic_fw.h | 23 +- drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 60 +-- drivers/net/ethernet/meta/fbnic/fbnic_netdev.h | 4 +- drivers/net/ethernet/meta/fbnic/fbnic_pci.c | 6 +- drivers/net/ethernet/meta/fbnic/fbnic_rpc.c | 86 ++- drivers/net/ethernet/meta/fbnic/fbnic_rpc.h | 4 + drivers/net/pse-pd/Kconfig | 11 + drivers/net/pse-pd/Makefile | 1 + drivers/net/pse-pd/si3474.c | 578 +++++++++++++++++++++ include/linux/ipv6.h | 2 +- include/linux/skmsg.h | 2 +- include/linux/udp.h | 1 + include/net/raw.h | 1 + include/net/sock.h | 56 +- include/net/tcp.h | 2 +- include/net/udp.h | 3 +- net/core/datagram.c | 2 +- net/core/sock.c | 16 +- net/ipv4/ping.c | 2 +- net/ipv4/raw.c | 7 +- net/ipv4/tcp_input.c | 2 +- net/ipv4/tcp_ipv4.c | 4 +- net/ipv4/udp.c | 14 +- net/ipv6/datagram.c | 2 +- net/ipv6/raw.c | 9 +- net/ipv6/tcp_ipv6.c | 4 +- net/ipv6/udp.c | 6 +- net/iucv/af_iucv.c | 4 +- net/mptcp/protocol.c | 2 +- net/netlink/af_netlink.c | 4 +- net/packet/af_packet.c | 2 +- net/phonet/pep.c | 6 +- net/phonet/socket.c | 2 +- net/sctp/diag.c | 2 +- net/tipc/socket.c | 6 +- tools/testing/selftests/bpf/progs/bpf_iter_udp4.c | 3 +- tools/testing/selftests/bpf/progs/bpf_iter_udp6.c | 4 +- 39 files changed, 1073 insertions(+), 120 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.6sdluimmbS b/tmp/tmp.nWh5bD4Q8d index 4dab756bec8e..41e4f1095f64 100644 --- a/tmp/tmp.6sdluimmbS +++ b/tmp/tmp.nWh5bD4Q8d @@ -12,6 +12,20 @@ nipa: config: x86: use periodic HZ tick nipa: disable 6.17's merge window kunit tests nipa: dbg net/sctp_vrf.sh nipa: disable random kunit tests +bng_en: Configure default VNIC +bng_en: Register default VNIC +bng_en: Register rings with the firmware +bng_en: Allocate stat contexts +bng_en: Allocate packet buffers +bng_en: Initialise core resources +bng_en: Introduce VNIC +bng_en: Add initial support for CP and NQ rings +bng_en: Add initial support for RX and TX rings +Merge tag 'wireless-2025-08-28' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless +net/smc: fix one NULL pointer dereference in smc_ib_is_sg_need_sync() +eth: mlx4: Fix IS_ERR() vs NULL check bug in mlx4_en_create_rx_ring +microchip: lan865x: add ndo_eth_ioctl handler to enable PHY ioctl support +ptp: Limit time setting of PTP clocks net: renesas: rswitch: add modifiable ageing time net: renesas: rswitch: add offloading for L2 switching net: renesas: rswitch: configure default ageing time @@ -32,7 +46,6 @@ riscv: dts: spacemit: Add Ethernet support for BPI-F3 riscv: dts: spacemit: Add Ethernet support for K1 net: spacemit: Add K1 Ethernet MAC dt-bindings: net: Add support for SpacemiT K1 -net/core: Replace offensive comment in skbuff.c vsock/test: Remove redundant semicolons ptp: ocp: fix use-after-free bugs causing by ptp_ocp_watchdog tcp: Free TCP-AO/TCP-MD5 info/keys without RCU @@ -40,13 +53,7 @@ tcp: Destroy TCP-AO, TCP-MD5 keys in .sk_destruct() mISDN: Fix memory leak in dsp_hwec_enable() net: phy: micrel: Add PTP support for lan8842 net: phy: micrel: Introduce function __lan8814_ptp_probe_once -eth: mlx4: Fix IS_ERR() vs NULL check bug in mlx4_en_create_rx_ring mctp pcc: Implement MCTP over PCC Transport -net: rnpgbe: Add register_netdev -net: rnpgbe: Add basic mbx_fw support -net: rnpgbe: Add basic mbx ops support -net: rnpgbe: Add n500/n210 chip support -net: rnpgbe: Add build support for rnpgbe selftests: net: avoid memory leak pppoe: drop sock reference counting on fast path pppoe: remove rwlock usage @@ -78,34 +85,45 @@ gve: remove redundant ternary operators microchip: lan865x: Fix LAN8651 autoloading microchip: lan865x: Fix module autoloading net: ethernet: oa_tc6: Handle failure of spi_setup -net: thunderx: Remove redundant ternary operators -net: aquantia: Remove redundant ternary operators net: stmmac: minor cleanups to stmmac_bus_clks_config() net: stmmac: mdio: use netdev_priv() directly ipv6: annotate data-races around devconf->rpl_seg_enabled net: phy: mtk-2p5ge: Add LED support for MT7988 -net/mlx5: {DR,HWS}, Use the cached vhca_id for this device -net/mlx5: E-switch, Set representor attributes for adjacent VFs -net/mlx5: E-Switch, Register representors for adjacent vports -net/mlx5: E-Switch, Create acls root namespace for adjacent vports -net/mlx5: E-Switch, Add support for adjacent functions vports discovery -net/mlx5: E-Switch, Move vport acls root namespaces creation to eswitch -net/mlx5: FS, Convert vport acls root namespaces to xarray net: dsa: lantiq_gswip: move MDIO bus registration to .setup() net: dsa: lantiq_gswip: support standard MDIO node name net: dsa: lantiq_gswip: support offset of MII registers net: dsa: lantiq_gswip: ignore SerDes modes in phylink_mac_config() net: dsa: lantiq_gswip: support model-specific mac_select_pcs() net: dsa: lantiq_gswip: move to dedicated folder -fbnic: Push local unicast MAC addresses to FW to populate TCAMs -fbnic: Add logic to repopulate RPC TCAM if BMC enables channel -fbnic: Pass fbnic_dev instead of netdev to __fbnic_set/clear_rx_mode -fbnic: Move promisc_sync out of netdev code and into RPC path -net: pse-pd: Add Si3474 PSE controller driver -dt-bindings: net: pse-pd: Add bindings for Si3474 PSE controller -inet: raw: add drop_counters to raw sockets -udp: add drop_counters to udp socket -net: add sk->sk_drop_counters -net: add sk_drops_skbadd() helper -net: add sk_drops_read(), sk_drops_inc() and sk_drops_reset() helpers net: usb: r8152: resume-reset deadlock +Merge tag 'iwlwifi-fixes-2025-08-28' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next +wifi: iwlwifi: cfg: add back more lost PCI IDs +wifi: iwlwifi: fix byte count table for old devices +wifi: iwlwifi: cfg: restore some 1000 series configs +Merge tag 'mt76-fixes-2025-08-27' of https://github.com/nbd168/wireless +wifi: mwifiex: Initialize the chan_stats array to zero +wifi: mac80211: do not permit 40 MHz EHT operation on 5/6 GHz +wifi: iwlwifi: uefi: check DSM item validity +wifi: iwlwifi: acpi: check DSM func validity +wifi: iwlwifi: if scratch is ~0U, consider it a failure +wifi: mt76: fix linked list corruption +wifi: mt76: free pending offchannel tx frames on wcid cleanup +wifi: mt76: mt7915: fix list corruption after hardware restart +wifi: mt76: mt7996: add missing check for rx wcid entries +wifi: mt76: do not add non-sta wcid entries to the poll list +wifi: mt76: mt7996: fix crash on some tx status reports +wifi: mt76: mt7996: use the correct vif link for scanning/roc +wifi: mt76: mt7996: disable beacons when going offchannel +wifi: mt76: prevent non-offchannel mgmt tx during scan/roc +wifi: mt76: mt7925: skip EHT MLD TLV on non-MLD and pass conn_state for sta_cmd +wifi: mt76: mt7925u: use connac3 tx aggr check in tx complete +wifi: mt76: mt7925: fix the wrong bss cleanup for SAP +wifi: mt76: mt7925: fix locking in mt7925_change_vif_links() +wifi: mt76: mt7921: don't disconnect when CSA to DFS chan +wifi: mt76: mt7996: Initialize hdr before passing to skb_put_data() +wifi: mac80211: increase scan_ies_len for S1G +wifi: mac80211: fix incorrect type for ret +wifi: brcmfmac: fix use-after-free when rescheduling brcmf_btcoex_info work +wifi: cfg80211: fix use-after-free in cmp_bss() +wifi: rt2x00: fix CRC_CCITT dependency +wifi: rt2800: select CONFIG_RT2X00_LIB as needed