Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-10-10--09-00 (v6.12-rc1-537-g9ae759eb7e36) remotes/brancher/net-next-2024-10-10--12-00 (v6.12-rc1-547-g0d8fd83a33cb) ==== BASE DIFF ==== .../ethernet/mellanox/mlx5/core/esw/devlink_port.c | 4 +- .../mellanox/mlx5/core/esw/diag/qos_tracepoint.h | 39 +- .../net/ethernet/mellanox/mlx5/core/esw/legacy.c | 6 +- drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 668 ++++++++++++--------- drivers/net/ethernet/mellanox/mlx5/core/esw/qos.h | 9 +- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 22 +- drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 32 +- .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 4 +- .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 2 + drivers/net/ethernet/mellanox/mlx5/core/qos.c | 12 +- drivers/net/ethernet/mellanox/mlx5/core/rl.c | 58 ++ drivers/net/ethernet/meta/fbnic/Makefile | 3 +- drivers/net/ethernet/meta/fbnic/fbnic.h | 11 + drivers/net/ethernet/meta/fbnic/fbnic_csr.h | 39 ++ drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 54 ++ drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 91 ++- drivers/net/ethernet/meta/fbnic/fbnic_netdev.h | 18 + drivers/net/ethernet/meta/fbnic/fbnic_pci.c | 9 +- drivers/net/ethernet/meta/fbnic/fbnic_rpc.c | 31 + drivers/net/ethernet/meta/fbnic/fbnic_time.c | 303 ++++++++++ drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 168 +++++- drivers/net/ethernet/meta/fbnic/fbnic_txrx.h | 3 + drivers/net/phy/phy_device.c | 11 + include/linux/mlx5/mlx5_ifc.h | 67 ++- include/net/l3mdev.h | 2 +- net/core/dst.c | 17 +- net/ipv4/netfilter/nft_fib_ipv4.c | 4 +- net/ipv6/netfilter/nft_fib_ipv6.c | 5 +- net/netfilter/xt_CHECKSUM.c | 33 +- net/netfilter/xt_CLASSIFY.c | 16 +- net/netfilter/xt_CONNSECMARK.c | 36 +- net/netfilter/xt_CT.c | 106 ++-- net/netfilter/xt_IDLETIMER.c | 59 +- net/netfilter/xt_LED.c | 39 +- net/netfilter/xt_NFLOG.c | 36 +- net/netfilter/xt_RATEEST.c | 39 +- net/netfilter/xt_SECMARK.c | 27 +- net/netfilter/xt_TRACE.c | 35 +- net/netfilter/xt_addrtype.c | 15 +- net/netfilter/xt_cluster.c | 33 +- net/netfilter/xt_connbytes.c | 4 +- net/netfilter/xt_connlimit.c | 39 +- net/netfilter/xt_connmark.c | 28 +- net/netfilter/xt_mark.c | 42 +- .../selftests/net/netfilter/conntrack_vrf.sh | 33 + 45 files changed, 1752 insertions(+), 560 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.JvKqdPlUnD b/tmp/tmp.s5ARRsQ8QP index 207d7fd556c2..e18be5a5e9b0 100644 --- a/tmp/tmp.JvKqdPlUnD +++ b/tmp/tmp.s5ARRsQ8QP @@ -1,11 +1,25 @@ tc_action dbg profile patch forwarding: set timeout to 3 hours -selftests: netfilter: conntrack_vrf.sh: add fib test case -netfilter: fib: check correct rtable in vrf setups -netfilter: xtables: avoid NFPROTO_UNSPEC where needed +net: macb: Avoid 20s boot delay by skipping MDIO bus registration for fixed-link PHY +net: enetc: disable NAPI after all rings are disabled +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: mvpp2: Add parser configuration for DSA tags +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 +ipv6: use READ_ONCE()/WRITE_ONCE() on fib6_table->fib_seq +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(). @@ -29,9 +43,6 @@ 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 -net: enetc: disable IRQ after Rx and Tx BD rings are disabled -net: enetc: fix the issues of XDP_REDIRECT feature -net: enetc: remove xdp_drops statistic from enetc_xdp_drop() 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 @@ -55,39 +66,10 @@ net: tunnel: make skb_vlan_inet_prepare() return drop reasons net: tunnel: add pskb_inet_may_pull_reason() helper net: skb: add pskb_network_may_pull_reason() helper net: phy: populate host_interfaces when attaching PHY -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: phy: Validate PHY LED OPs presence before registering phonet: Handle error of rtnl_register_module(). mpls: Handle error of rtnl_register_module(). mctp: Handle error of rtnl_register_module(). bridge: Handle error of rtnl_register_module(). vxlan: Handle error of rtnl_register_module(). rtnetlink: Add bulk registration helpers for rtnetlink message handlers. -net/mlx5: Add support check for TSAR types in QoS scheduling -net/mlx5: Unify QoS element type checks across NIC and E-Switch -net/mlx5: qos: Refactor locking to a qos domain mutex -net/mlx5: qos: Store rate groups in a qos domain -net/mlx5: qos: Rename rate group 'list' as 'parent_entry' -net/mlx5: qos: Add an explicit 'dev' to vport trace calls -net/mlx5: qos: Store the eswitch in a mlx5_esw_rate_group -net/mlx5: qos: Drop 'esw' param from vport qos functions -net/mlx5: qos: Always create group0 -net/mlx5: qos: Maintain rate group vport members in a list -net/mlx5: qos: Refactor and document bw_share calculation -net/mlx5: qos: Consistently name vport vars as 'vport' -net/mlx5: qos: Rename vport 'tsar' into 'sched_elem'. -net/mlx5: qos: Flesh out element_attributes in mlx5_ifc.h -eth: fbnic: add ethtool timestamping statistics -eth: fbnic: add TX packets timestamping support -eth: fbnic: add RX packets timestamping support -eth: fbnic: add initial PHC support -eth: fbnic: add software TX timestamping support -net: Remove likely from l3mdev_master_ifindex_by_index eth: remove the DLink/Sundance (ST201) driver -net: phylink: remove "using_mac_select_pcs" -net: dsa: mv88e6xxx: return NULL when no PCS is present -net: dsa: remove dsa_port_phylink_mac_select_pcs() -net: do not delay dst_entries_add() in dst_release() -tipc: Return -EINVAL on error from addr2str() methods