Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-08-29--00-00 remotes/brancher/net-next-2024-08-29--03-00 ==== BASE DIFF ==== drivers/net/dsa/mv88e6xxx/global2_scratch.c | 2 +- drivers/net/ethernet/faraday/ftgmac100.c | 28 ++++++++++++++++++-- drivers/net/ethernet/hisilicon/hip04_eth.c | 1 + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 1 + drivers/net/ethernet/hisilicon/hns_mdio.c | 1 + drivers/net/hyperv/hyperv_net.h | 2 +- drivers/net/hyperv/netvsc_drv.c | 3 ++- drivers/net/xen-netback/hash.c | 5 ++-- include/net/busy_poll.h | 2 +- include/net/inet_timewait_sock.h | 2 +- net/ethtool/cabletest.c | 4 +-- net/ipv4/inet_diag.c | 4 +-- net/ipv4/tcp_ipv4.c | 6 ++--- net/ipv4/tcp_minisocks.c | 31 +++++++++++++---------- net/ipv6/tcp_ipv6.c | 5 ++-- 15 files changed, 64 insertions(+), 33 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.epUZlYooBq b/tmp/tmp.R1ikYCvaEo index b7558ec51859..bf21a43c65b1 100644 --- a/tmp/tmp.epUZlYooBq +++ b/tmp/tmp.R1ikYCvaEo @@ -1,6 +1,7 @@ profile patch selftests/bpf: Fix a btf_dump selftest failure forwarding: set timeout to 3 hours +sfc: Convert to use ERR_CAST() ice: Add netif_device_attach/detach into PF reset flow igb: Fix not clearing TimeSync interrupts for 82580 net: phy: aquantia: allow forcing order of MDI pairs @@ -9,7 +10,6 @@ net: ag71xx: update FIFO bits and descriptions netfilter: nf_tables_ipv6: consider network offset in netdev/egress validation netfilter: nf_tables: restore IP sanity checks for netdev/egress net: ag71xx: disable napi interrupts during probe -netfilter: nf_tables: Correct spelling in nf_tables.h selftests: add selftest for tcp SO_PEEK_OFF support tcp: add SO_PEEK_OFF socket option tor TCPv6 bnxt_en: Support dynamic MSIX @@ -26,12 +26,6 @@ ethtool: pse-pd: move pse validation into set tools: ynl: error check scanf() in a sample net: make SOF_TIMESTAMPING_RX_SOFTWARE feature per socket tcp: make SOF_TIMESTAMPING_RX_SOFTWARE feature per socket -sfc: add per-queue RX and TX bytes stats -sfc: implement per-queue TSO (hw_gso) stats -sfc: implement per-queue rx drop and overrun stats -sfc: add n_rx_overlength to ethtool stats -sfc: implement basic per-queue stats -sfc: remove obsolete counters from struct efx_channel net: alacritech: Switch to use dev_err_probe() net/ipv4: net: prefer strscpy over strcpy net/tipc: replace deprecated strcpy with strscpy @@ -42,7 +36,6 @@ net: prefer strscpy over strcpy net: hns: Use IS_ERR_OR_NULL() helper function net: dsa: realtek: make use of dev_err_cast_probe() net: ipa: make use of dev_err_cast_probe() -netfilter: conntrack: Convert to use ERR_CAST() net: ti: icssg-prueth: Enable HSR Tx Tag and Rx Tag offload net: ti: icssg-prueth: Add multicast filtering support in HSR mode net: ti: icssg-prueth: Enable HSR Tx Packet duplication offload @@ -80,29 +73,6 @@ net: vertexcom: mse102x: Drop log message on remove net: vertexcom: mse102x: Fix random MAC address log net: vertexcom: mse102x: Silence TX timeout net: vertexcom: mse102x: Use DEFINE_SIMPLE_DEV_PM_OPS -net: dsa: mv88e6xxx: Remove stale comment -net: hisilicon: hns_mdio: fix OF node leak in probe() -net: hisilicon: hns_dsaf_mac: fix OF node leak in hns_mac_get_info() -net: hisilicon: hip04: fix OF node leak in probe() -cn10k-ipsec: Enable outbound ipsec crypto offload -cn10k-ipsec: Allow ipsec crypto offload for skb with SA -cn10k-ipsec: Process outbound ipsec crypto offload -cn10k-ipsec: Add SA add/del support for outb ipsec crypto offload -cn10k-ipsec: Init hardware for outbound ipsec crypto offload -octeontx2-af: Disable backpressure between CPT and NIX -octeontx2-pf: Move skb fragment map/unmap to common code -octeontx2-pf: map skb data as device writeable -net: add ndo_validate_addr check in dev_set_mac_address -net: hibmcge: Add maintainer for hibmcge -net: hibmcge: Add a Makefile and update Kconfig for hibmcge -net: hibmcge: Implement some ethtool_ops functions -net: hibmcge: Implement rx_poll function to receive packets -net: hibmcge: Implement .ndo_start_xmit function -net: hibmcge: Implement some .ndo functions -net: hibmcge: Add interrupt supported in this module -net: hibmcge: Add mdio and hardware configuration supported in this module -net: hibmcge: Add read/write registers supported through the bar space -net: hibmcge: Add pci table supported in this module net: dsa: vsc73xx: implement FDB operations testing/selftest: add test tool and scripts for ovpn module ovpn: add basic ethtool support @@ -129,15 +99,10 @@ ovpn: add basic netlink support net: introduce OpenVPN Data Channel Offload (ovpn) rtnetlink: don't crash on unregister if no dellink exists netlink: add NLA_POLICY_MAX_LEN macro -net: busy-poll: use ktime_get_ns() instead of local_clock() -net/sunrpc: make use of the helper macro LIST_HEAD() -net: ethtool: cable-test: Release RTNL when the PHY isn't found selftests: netfilter: nft_queue.sh: reduce test file size for debug build nfc: pn533: Add poll mod list filling check wifi: mac80211: use kmemdup_array instead of kmemdup for multiple allocation -net: netvsc: Update default VMBus channels ptp: Add support for the AMZNC10C 'vmclock' device -net/xen-netback: prevent UAF in xenvif_flush_hash() phy: dp83tg720: Add statistics support phy: Add defines for standardized PHY generic counters phy: open_alliance_helpers: Add defines for link quality metrics