Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-10-31--09-00 (v6.12-rc4-1210-g3af386b74152) remotes/brancher/net-next-2024-10-31--12-00 (v6.12-rc4-1226-gc84930fe34ab) ==== BASE DIFF ==== drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 4 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 59 +++++++++++++++++++++- drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 2 + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 33 ++++++++++++ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 45 +++++++++++++---- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 3 ++ .../ethernet/hisilicon/hns3/hns3pf/hclge_regs.c | 9 ++-- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 40 ++++++++++++--- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.c | 9 ++-- net/bluetooth/hci_sync.c | 18 ++++--- net/ipv6/netfilter/nf_reject_ipv6.c | 15 +++--- net/netfilter/nft_payload.c | 3 ++ net/netfilter/x_tables.c | 2 +- .../selftests/net/netfilter/conntrack_dump_flush.c | 6 +-- 14 files changed, 203 insertions(+), 45 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.ngy20aPyeQ b/tmp/tmp.HKBGFeU7gh index 2dbdba2ce5fd..6b3423d7d2d7 100644 --- a/tmp/tmp.ngy20aPyeQ +++ b/tmp/tmp.HKBGFeU7gh @@ -3,11 +3,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: enetc: prevent PF from configuring MAC address for an enabled VF -net: enetc: allocate vf_state during PF probes -Merge tag 'for-net-2024-10-30' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth i40e: Fix handling changed priv flags +ipvlan: Prepare ipvlan_process_v4_outbound() to future .flowi4_tos conversion. +net: tcp: replace the document for "lsndtime" in tcp_sock +MAINTAINERS: update ENETC driver files and maintainers +net: enetc: add preliminary support for i.MX95 ENETC PF +net: enetc: optimize the allocation of tx_bdr +net: enetc: extract enetc_int_vector_init/destroy() from enetc_alloc_msix() +net: enetc: add i.MX95 EMDIO support +net: enetc: remove ERR050089 workaround for i.MX95 +net: enetc: build enetc_pf_common.c as a separate module +net: enetc: extract common ENETC PF parts for LS1028A and i.MX95 platforms +net: enetc: add initial netc-blk-ctrl driver support +dt-bindings: net: add bindings for NETC blocks control +dt-bindings: net: add i.MX95 ENETC support +dt-bindings: net: add compatible string for i.MX95 EMDIO sunrpc: fix one UAF issue caused by sunrpc kernel tcp socket +net: macb: avoid redundant lookup for "mdio" child node in MDIO setup net: enetc: prevent VF from configuring preemptiable TCs net: xilinx: axienet: Check if Tx queue enabled net: xilinx: axienet: Enqueue Tx packets in dql before dmaengine starts @@ -35,8 +47,6 @@ dql: annotate data-races around dql->last_obj_cnt net: ipv4: Cache pmtu for all packet paths if multipath enabled ieee802154: ca8210: Add missing check for kfifo_alloc() in ca8210_probe() sctp: properly validate chunk size in sctp_sf_ootb() -mctp pcc: Implement MCTP over PCC Transport -mctp pcc: Check before sending MCTP PCC response ACK net: dpaa_eth: extract hash using __be32 pointer in rx_default_dqrr() net: dpaa_eth: add assertions about SGT entry offsets in sg_fd_to_skb() soc: fsl_qbman: use be16_to_cpu() in qm_sg_entry_get_off() @@ -102,15 +112,6 @@ bnx2x: remove redundant NULL-pointer check net: netpoll: flush skb pool during cleanup net: netpoll: Individualize the skb pool net: netpoll: Defer skb_pool population until setup success -net: hns3: fix kernel crash when 1588 is sent on HIP08 devices -net: hns3: fixed hclge_fetch_pf_reg accesses bar space out of bounds issue -net: hns3: initialize reset_timer before hclgevf_misc_irq_init() -net: hns3: don't auto enable misc vector -net: hns3: Resolved the issue that the debugfs query result is inconsistent. -net: hns3: fix missing features due to dev->features configuration too early -net: hns3: fixed reset failure issues caused by the incorrect reset type -net: hns3: add sync command to sync io-pgtable -net: hns3: default enable tx bounce buffer when smmu enabled tcp: only release congestion control if it has been initialized net/smc: increase SMC_WR_BUF_CNT enic: Adjust used MSI-X wq/rq/cq/interrupt resources in a more robust way @@ -131,5 +132,3 @@ net: hsr: Add VLAN CTAG filter support net: hsr: Add VLAN support net: tcp: Add noinline_for_tracing annotation for tcp_drop_reason() compiler_types: Add noinline_for_tracing annotation -net/smc: use new helper to get the netdev associated to an ibdev -Bluetooth: hci: fix null-ptr-deref in hci_read_supported_codecs