Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-10-10--03-00 (v6.12-rc1-515-g83218782ed5f) remotes/brancher/net-next-2024-10-10--06-00 (v6.12-rc1-523-g331332c4c561) ==== BASE DIFF ==== .../device_drivers/ethernet/intel/ice.rst | 31 +++++++++ drivers/net/ethernet/intel/e1000/e1000_main.c | 5 ++ drivers/net/ethernet/intel/e1000e/hw.h | 4 +- drivers/net/ethernet/intel/e1000e/netdev.c | 21 +++--- drivers/net/ethernet/intel/i40e/i40e_main.c | 1 + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 2 + drivers/net/ethernet/intel/iavf/iavf.h | 10 --- drivers/net/ethernet/intel/iavf/iavf_prototype.h | 3 - drivers/net/ethernet/intel/ice/ice.h | 4 +- drivers/net/ethernet/intel/ice/ice_base.c | 34 +++++----- drivers/net/ethernet/intel/ice/ice_eswitch.h | 5 -- drivers/net/ethernet/intel/ice/ice_eswitch_br.c | 5 +- drivers/net/ethernet/intel/ice/ice_eswitch_br.h | 1 + drivers/net/ethernet/intel/ice/ice_ethtool.c | 77 ++++++++++++++++++++++ drivers/net/ethernet/intel/ice/ice_flex_pipe.h | 3 - drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 3 + drivers/net/ethernet/intel/ice/ice_lib.c | 3 + drivers/net/ethernet/intel/ice/ice_lib.h | 2 - drivers/net/ethernet/intel/ice/ice_main.c | 58 +++++++--------- drivers/net/ethernet/intel/ice/ice_ptp.c | 32 ++++----- drivers/net/ethernet/intel/ice/ice_ptp_hw.h | 3 - drivers/net/ethernet/intel/ice/ice_sriov.c | 14 ++-- drivers/net/ethernet/intel/ice/ice_txrx.h | 3 +- drivers/net/ethernet/intel/ice/ice_txrx_lib.h | 1 - drivers/net/ethernet/intel/ice/ice_vf_lib.c | 28 ++++++-- .../net/ethernet/intel/ice/ice_vf_lib_private.h | 1 - drivers/net/ethernet/intel/ice/ice_vf_mbx.c | 32 +++++++++ drivers/net/ethernet/intel/ice/ice_vf_mbx.h | 9 +++ drivers/net/ethernet/intel/ice/ice_virtchnl.c | 34 +++++----- drivers/net/ethernet/intel/igb/e1000_mac.h | 1 - drivers/net/ethernet/intel/igb/e1000_nvm.h | 1 - drivers/net/ethernet/intel/igb/igb_main.c | 4 ++ include/linux/inetdevice.h | 2 +- include/net/netns/ipv4.h | 2 + net/ipv4/devinet.c | 69 ++++++++++--------- 35 files changed, 342 insertions(+), 166 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.uKRMhuuh59 b/tmp/tmp.HkQjIUwCwc index 1b5cab7c3a87..70cde04d3d62 100644 --- a/tmp/tmp.uKRMhuuh59 +++ b/tmp/tmp.HkQjIUwCwc @@ -8,6 +8,11 @@ ppp: fix ppp_async_encode() illegal access ipv4: give an IPv4 dev to blackhole_netdev tcp/dccp: Don't use timer_pending() in reqsk_queue_unlink(). net: sparx5: fix source port register when mirroring +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 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() @@ -37,25 +42,6 @@ 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 -e1000: Link NAPI instances to queues and IRQs -e1000e: Link NAPI instances to queues and IRQs -e1000e: Remove duplicated writel() in e1000_configure_tx/rx() -igb: Cleanup unused declarations -iavf: Remove unused declarations -ice: Cleanup unused declarations -ice: Use common error handling code in two functions -ice: Make use of assign_bit() API -ice: store max_frame and rx_buf_len only in ice_rx_ring -ice: consistently use q_idx in ice_vc_cfg_qs_msg() -ice: add E830 HW VF mailbox message limit support -ice: Implement ethtool reset support -e1000e: change I219 (19) devices to ADP -igb: Do not bring the device up after non-fatal error -i40e: Fix macvlan leak by synchronizing access to mac_filter_hash -ice: Fix increasing MSI-X on VF -ice: Flush FDB entries before reset -ice: Fix netif_is_ice() in Safe Mode -ice: Fix entering Safe Mode net: phy: Validate PHY LED OPs presence before registering phonet: Handle error of rtnl_register_module(). mpls: Handle error of rtnl_register_module(). @@ -82,10 +68,6 @@ 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 -ipv4: Retire global IPv4 hash table inet_addr_lst. -ipv4: Namespacify IPv4 address GC. -ipv4: Use per-netns hash table in inet_lookup_ifaddr_rcu(). -ipv4: Link IPv4 address to per-netns hash table. net: Remove likely from l3mdev_master_ifindex_by_index eth: remove the DLink/Sundance (ST201) driver net: phylink: remove "using_mac_select_pcs"