Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-12-06--00-00 (v6.13-rc1-365-gc07d4484bc01) remotes/brancher/net-next-2024-12-06--03-01 (v6.13-rc1-353-gd87552490795) ==== BASE DIFF ==== Documentation/netlink/genetlink-c.yaml | 3 + Documentation/netlink/genetlink-legacy.yaml | 3 + Documentation/netlink/specs/ethtool.yaml | 358 ++++++++- Documentation/userspace-api/netlink/c-code-gen.rst | 4 +- MAINTAINERS | 2 +- include/net/dropreason-core.h | 18 + include/net/sch_generic.h | 8 + include/uapi/linux/ethtool_netlink.h | 893 +-------------------- include/uapi/linux/ethtool_netlink_generated.h | 792 ++++++++++++++++++ net/sched/sch_fq.c | 14 +- net/sched/sch_sfq.c | 4 + net/tipc/udp_media.c | 7 +- tools/net/ynl/ynl-gen-c.py | 139 +++- .../tc-testing/scripts/sfq_rejects_limit_1.py | 21 + .../selftests/tc-testing/tc-tests/qdiscs/sfq.json | 20 + 15 files changed, 1340 insertions(+), 946 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.8wU1pkHdDj b/tmp/tmp.kLjdhWjNZh index e62064eb94f4..9b2d41bbda6a 100644 --- a/tmp/tmp.8wU1pkHdDj +++ b/tmp/tmp.kLjdhWjNZh @@ -60,13 +60,6 @@ net: pcs: pcs-lynx: implement pcs_inband_caps() method net: ti: icssg-prueth: Fix clearing of IEP_CMP_CFG registers during iep_init net: ti: icssg-prueth: Fix firmware load sequence. tun: fix group permission check -net: ftgmac100: remove extra newline symbols -net: ftgmac100: Add 64-bit DMA support for AST2700 -net: ftgmac100: add pin strap configuration for AST2700 -net: ftgmac100: Add support for AST2700 -net: ftgmac100: Add reset toggling for Aspeed SOCs -net: faraday: Add ARM64 in FTGMAC100 for AST2700 -dt-bindings: net: ftgmac100: support for AST2700 ice: cleanup Rx queue context programming functions ice: move prefetch enable to ice_setup_rx_ctx ice: reduce size of queue context fields @@ -93,8 +86,6 @@ bnxt_en: Fix GSO type for HW GRO packets on 5750X chips net: tipc: remove one synchronize_net() from tipc_nametbl_stop() tcp: Add sysctl to configure TIME-WAIT reuse delay tcp: Measure TIME-WAIT reuse delay with millisecond precision -net_sched: sch_fq: add three drop_reason -tipc: fix NULL deref in cleanup_bearer() netconsole: selftest: verify userdata entry limit netconsole: selftest: Delete all userdata keys netconsole: selftest: Split the helpers from the selftest @@ -120,8 +111,6 @@ 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 -selftests/tc-testing: sfq: test that kernel rejects limit of 1 -net_sched: sch_sfq: don't allow 1 packet limit net: simplify resource acquisition + ioremap xdp: get rid of xdp_frame::mem.id page_pool: allow mixing PPs within one bulk @@ -134,13 +123,6 @@ xdp, xsk: constify read-only arguments of some static inline helpers bpf, xdp: constify some bpf_prog * function arguments xsk: align &xdp_buff_xsk harder ptp: kvm: x86: Return EOPNOTSUPP instead of ENODEV from kvm_arch_ptp_init() -net: hibmcge: Add nway_reset supported in this module -net: hibmcge: Add reset supported in this module -net: hibmcge: Add pauseparam supported in this module -net: hibmcge: Add register dump supported in this module -net: hibmcge: Add unicast frame filter supported in this module -net: hibmcge: Add irq_info file to debugfs -net: hibmcge: Add debugfs supported in this module net: freescale: ucc_geth: phylink conversion net: freescale: ucc_geth: Introduce a helper to check Reduced modes net: freescale: ucc_geth: Move the serdes configuration around @@ -151,12 +133,3 @@ net: freescale: ucc_geth: Fix WOL configuration net: freescale: ucc_geth: Use netdev->phydev to access the PHY net: freescale: ucc_geth: split adjust_link for phylink conversion net: freescale: ucc_geth: Drop support for the "interface" DT property -Merge branch 'ethtool-generate-uapi-header-from-the-spec' -ethtool: regenerate uapi header from the spec -ethtool: remove the comments that are not gonna be generated -ethtool: separate definitions that are gonna be generated -ynl: include uapi header after all dependencies -ynl: add missing pieces to ethtool spec to better match uapi header -ynl: support directional specs in ynl-gen-c.py -ynl: skip rendering attributes with header property in uapi mode -ynl: support enum-cnt-name attribute in legacy definitions