Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-12-04--03-00 (net-next-6.13-9309-ge63b03971a98) remotes/brancher/net-next-2024-12-04--06-00 (net-next-6.13-9296-g1264399b61ed) ==== BASE DIFF ==== drivers/net/ethernet/realtek/r8169.h | 2 +- drivers/net/ethernet/realtek/r8169_main.c | 17 +---------------- drivers/net/ethernet/realtek/r8169_phy_config.c | 10 ---------- net/core/dev.c | 18 ++++++++++++------ net/ethtool/ioctl.c | 3 ++- net/ipv4/udp.c | 14 +++----------- 6 files changed, 19 insertions(+), 45 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.xdFvihwwJi b/tmp/tmp.pcyrFjFPgA index 5ef27b0c3705..fd07621e6644 100644 --- a/tmp/tmp.xdFvihwwJi +++ b/tmp/tmp.pcyrFjFPgA @@ -3,6 +3,12 @@ fs/9p: use kvzalloc/kvfree to allocate struct p9_rdir and its buffer tc_action dbg profile patch forwarding: set timeout to 3 hours +bnxt_en: handle tpa_info in queue API implementation +bnxt_en: refactor bnxt_alloc_rx_rings() to call bnxt_alloc_rx_agg_bmap() +bnxt_en: refactor tpa_info alloc/free into helpers +tcp: Check space before adding MPTCP options +selftests/tc-testing: sfq: test that kernel rejects limit of 1 +net_sched: sch_sfq: don't allow 1 packet limit tcp: replace head->tstamp with head->skb_mstamp_ns in tcp_tso_should_defer() wireguard: allowedips: Add WGALLOWEDIP_F_REMOVE_ME flag ice: cleanup Rx queue context programming functions @@ -19,7 +25,6 @@ net: altera: simplify request_and_map net: altera: use devm for alloc_etherdev net: simplify resource acquisition + ioremap selftests/net: call sendmmsg via udpgso_bench.sh -net: modernize ioremap in probe net: mdio-ipq8064: remove _remove function net: mdio-ipq8064: use platform_get_resource igb: Fix potential invalid memory access in igb_init_module() @@ -40,7 +45,6 @@ net/mlx5: E-Switch, Fix switching to switchdev mode in MPV net/mlx5: E-Switch, Fix switching to switchdev mode with IB device disabled net/mlx5: HWS: Properly set bwc queue locks lock classes net/mlx5: HWS: Fix memory leak in mlx5hws_definer_calc_layout -net: wireguard: Allow binding to specific ifindex geneve: do not assume mac header is set in geneve_xmit_skb() xdp: get rid of xdp_frame::mem.id page_pool: allow mixing PPs within one bulk @@ -67,18 +71,6 @@ net: hibmcge: Add debugfs supported in this module vsock/test: verify socket options after setting them vsock/test: fix parameter types in SO_VM_SOCKETS_* calls vsock/test: fix failures due to wrong SO_RCVLOWAT parameter -cxgb4: use port number to set mac addr -selftests: forwarding: Add a selftest for the new reserved_bits UAPI -selftests: net: lib: Add several autodefer helpers -selftests: net: lib: Rename ip_link_master() to ip_link_set_master() -vxlan: Add an attribute to make VXLAN header validation configurable -vxlan: vxlan_rcv(): Drop unparsed -vxlan: Bump error counters for header mismatches -vxlan: Track reserved bits explicitly as part of the configuration -vxlan: vxlan_rcv(): Extract vxlan_hdr(skb) to a named variable -vxlan: vxlan_rcv() callees: Drop the unparsed argument -vxlan: vxlan_rcv() callees: Move clearing of unparsed flags out -vxlan: In vxlan_rcv(), access flags through the vxlan netdevice net: ipv6: rpl_iptunnel: mitigate 2-realloc issue net: ipv6: seg6_iptunnel: mitigate 2-realloc issue net: ipv6: ioam6_iptunnel: mitigate 2-realloc issue @@ -101,11 +93,6 @@ net: phy: Makefile: Add makefile support for ptp in Microchip phys net: phy: Kconfig: Add ptp library support and 1588 optional flag in Microchip phys net: phy: microchip_ptp : Add ptp library for Microchip phys net: phy: microchip_ptp : Add header file for Microchip ptp library -virtio_net: add missing netdev_tx_reset_queue to virtnet_sq_bind_xsk_pool() -virtio_ring: add 'flushed' as an argument to virtqueue_reset() -virtio_net: add missing netdev_tx_reset_queue() to virtnet_tx_resize() -virtio_ring: add 'flushed' as an argument to virtqueue_resize() -virtio_net: correct netdev_tx_reset_queue() invocation point selftests: net: cleanup busy_poller.c netpoll: Use rtnl_dereference() for npinfo pointer access net: gianfar: iomap with devm @@ -119,15 +106,10 @@ net: fsl_pq_mdio: use devm for of_iomap net: fsl_pq_mdio: use platform_get_resource net: fsl_pq_mdio: use devm for mdiobus_alloc_size net: fsl_pq_mdio: use dev variable in _probe -r8169: remove support for chip version 11 -r8169: remove unused flag RTL_FLAG_TASK_RESET_NO_QUEUE_WAKE netcons: Add udp send fail statistics to netconsole netpoll: Make netpoll_send_udp return status instead of void -net: Make napi_hash_lock irq safe -ethtool: Fix access to uninitialized fields in set RXNFC command net: sched: fix ordering of qlen adjustment qca_spi: Fix clock speed for multiple QCA7000 -Revert "udp: avoid calling sock_def_readable() if possible" ethtool: Fix wrong mod state in case of verbose and no_mask bitset net: sched: fix erspan_opt settings in cls_flower net/smc: support ipv4 mapped ipv6 addr client for smc-r v2