Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-10-10--15-00 (v6.12-rc1-563-g55e473d214ed) remotes/brancher/net-next-2024-10-10--18-00 (v6.12-rc1-596-g5998bf59448e) ==== BASE DIFF ==== Documentation/netlink/specs/net_shaper.yaml | 362 +++++ Documentation/networking/kapi.rst | 3 + Documentation/process/maintainer-netdev.rst | 17 + MAINTAINERS | 16 + drivers/net/Kconfig | 1 + drivers/net/ethernet/intel/Kconfig | 1 + drivers/net/ethernet/intel/iavf/iavf.h | 13 + drivers/net/ethernet/intel/iavf/iavf_main.c | 161 ++- drivers/net/ethernet/intel/iavf/iavf_txrx.h | 2 + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 157 ++- drivers/net/ethernet/intel/ice/ice.h | 2 + drivers/net/ethernet/intel/ice/ice_base.c | 2 + drivers/net/ethernet/intel/ice/ice_common.c | 21 + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 8 + drivers/net/ethernet/intel/ice/ice_txrx.h | 1 + drivers/net/ethernet/intel/ice/ice_type.h | 1 + drivers/net/ethernet/intel/ice/ice_vf_lib.h | 8 + drivers/net/ethernet/intel/ice/ice_virtchnl.c | 335 +++++ drivers/net/ethernet/intel/ice/ice_virtchnl.h | 11 + .../ethernet/intel/ice/ice_virtchnl_allowlist.c | 6 + drivers/net/netdevsim/ethtool.c | 2 + drivers/net/netdevsim/netdev.c | 39 + drivers/net/ppp/ppp_async.c | 2 +- drivers/net/slip/slhc.c | 57 +- drivers/net/vxlan/vxlan_mdb.c | 2 +- include/linux/avf/virtchnl.h | 119 ++ include/linux/netdevice.h | 21 + include/linux/netlink.h | 5 +- include/net/genetlink.h | 8 +- include/net/net_shaper.h | 120 ++ include/uapi/linux/net_shaper.h | 95 ++ net/Kconfig | 3 + net/Makefile | 1 + net/core/dev.c | 8 + net/core/dev.h | 10 + net/core/netdev-genl.c | 2 +- net/core/rtnetlink.c | 2 +- net/devlink/devl_internal.h | 2 +- net/ethtool/rss.c | 2 +- net/netfilter/nf_conntrack_netlink.c | 2 +- net/netlink/genetlink.c | 4 +- net/shaper/Makefile | 8 + net/shaper/shaper.c | 1438 ++++++++++++++++++++ net/shaper/shaper_nl_gen.c | 154 +++ net/shaper/shaper_nl_gen.h | 44 + net/smc/smc.h | 2 +- net/smc/smc_clc.h | 2 +- net/smc/smc_core.c | 2 +- net/smc/smc_core.h | 4 +- net/smc/smc_inet.c | 11 + tools/testing/selftests/drivers/net/Makefile | 1 + tools/testing/selftests/drivers/net/shaper.py | 461 +++++++ tools/testing/selftests/net/lib/py/__init__.py | 1 + tools/testing/selftests/net/lib/py/ynl.py | 5 + 54 files changed, 3723 insertions(+), 44 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.4CHriTcIga b/tmp/tmp.Zf3YgTlZgE index 37fa248b1165..26d821d94bb7 100644 --- a/tmp/tmp.4CHriTcIga +++ b/tmp/tmp.Zf3YgTlZgE @@ -2,8 +2,23 @@ fs/9p: use kvzalloc/kvfree to allocate struct p9_rdir and its buffer tc_action dbg profile patch forwarding: set timeout to 3 hours +net: stmmac: dwmac-tegra: Fix link bring-up sequence net: usb: usbnet: fix race in probe failure +net: phy: realtek: clear 1000Base-T link partner advertisement +net: phy: realtek: change order of calls in C22 read_status() +net: phy: realtek: read duplex and gbit master from PHYSR register +net: microchip: vcap api: Fix memory leaks in vcap_api_encode_rule_test() +net: phy: intel-xway: add support for PHY LEDs +net: phy: mxl-gpy: correctly describe LED polarity +net: phy: aquantia: correctly describe LED polarity override +net: phy: support 'active-high' property for PHY LEDs +dt-bindings: leds: add 'active-high' property udp: Compute L4 checksum as usual when not segmenting the skb +net/smc: Fix memory leak when using percpu refs +net: ethernet: ti: cpsw_ale: Remove unused accessor functions +net: ethernet: ti: am65-cpsw: Use tstats instead of open coded version +net: ethernet: ti: am65-cpsw: Use __be64 type for id_temp +r8169: enable SG/TSO on selected chip versions per default net: macb: Avoid 20s boot delay by skipping MDIO bus registration for fixed-link PHY selftests: net/psock_fanout: unbound socket fanout selftests: net/psock_fanout: socket joins fanout when link is down @@ -13,9 +28,13 @@ net: enetc: disable Tx BD rings after they are empty net: enetc: block concurrent XDP transmissions during ring reconfiguration net: enetc: remove xdp_drops statistic from enetc_xdp_drop() net: hsr: convert to use new timer APIs -ipv4/udp: Add 4-tuple hash for connected socket -net/udp: Add 4-tuple hash list basis -net/udp: Add a new struct for hash2 slot +net: phy: microchip_t1s: configure collision detection based on PLCA mode +net: phy: microchip_t1s: add support for Microchip's LAN867X Rev.C2 +net: phy: microchip_t1s: add support for Microchip's LAN867X Rev.C1 +net: phy: microchip_t1s: move LAN867X reset handling to a new function +net: phy: microchip_t1s: add support for Microchip's LAN865X Rev.B1 +net: phy: microchip_t1s: update new initial settings for LAN865X Rev.B0 +net: phy: microchip_t1s: restructure cfg read/write functions arguments net: phy: c45-tja11xx: add support for outputting RMII reference clock dt-bindings: net: tja11xx: add "nxp,rmii-refclk-out" property selftests: rtnetlink: update netdevsim ipsec output format @@ -27,9 +46,7 @@ net: phy: aquantia: poll status register netdev-genl: do not use rtnl in netdev_nl_napi_get_dumpit() netdev-genl: do not use rtnl in netdev_nl_napi_get_doit() net: dsa: mv88e6xxx: Fix uninitialised err value -netfilter: Record uid and gid in xt_AUDIT eth: fbnic: Add hardware monitoring support via HWMON interface -ppp: fix ppp_async_encode() illegal access ipv4: give an IPv4 dev to blackhole_netdev net: do not acquire rtnl in fib_seq_sum() ipmr: use READ_ONCE() to read net->ipv[46].ipmr_seq @@ -38,7 +55,6 @@ ipv4: use READ_ONCE()/WRITE_ONCE() on net->ipv4.fib_seq fib: rules: use READ_ONCE()/WRITE_ONCE() on ops->fib_rules_seq tg3: Link queues to NAPIs tg3: Link IRQs to NAPI instances -tcp/dccp: Don't use timer_pending() in reqsk_queue_unlink(). net: emaclite: Adopt clock support net: emaclite: Replace alloc_etherdev() with devm_alloc_etherdev() dt-bindings: net: emaclite: Add clock support @@ -57,18 +73,11 @@ selftests: net: lib: Introduce deferred commands net: add config option for tunnel fallback devs net: ethtool: Add support for writing firmware blocks using EPL payload net: ethtool: Add new parameters and a function to support EPL -net/smc: Address spelling errors tg3: Address byte-order miss-matches -docs: netdev: document guidance on cleanup patches -slip: make slhc_remember() more robust against malicious packets -MAINTAINERS: Add headers and mailing list to UDP section -MAINTAINERS: consistently exclude wireless files from NETWORKING [GENERAL] net: lan743x: Remove duplicate check posix-clock: Fix missing timespec64 check in pc_clock_settime() -net/smc: fix lacks of icsk_syn_mss with IPPROTO_SMC r8169: remove original workaround for RTL8125 broken rx issue r8169: don't apply UDP padding quirk on RTL8126A -net/smc: Fix memory leak in percpu refs net: vxlan: use kfree_skb_reason() in encap_bypass_if_local() net: vxlan: use kfree_skb_reason() in vxlan_encap_bypass() net: vxlan: use kfree_skb_reason() in vxlan_mdb_xmit()