Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.13-rc7).

Conflicts:
  a42d71e322a8 ("net_sched: sch_cake: Add drop reasons")
  737d4d91d35b ("sched: sch_cake: add bounds checks to host bulk flow fairness counts")

Adjacent changes:

drivers/net/ethernet/meta/fbnic/fbnic.h
  3a856ab34726 ("eth: fbnic: add IRQ reuse support")
  95978931d55f ("eth: fbnic: Revert "eth: fbnic: Add hardware monitoring support via HWMON interface"")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
Simple merge

diff --cc drivers/net/ethernet/meta/fbnic/fbnic.h
Simple merge

diff --cc drivers/net/ethernet/meta/fbnic/fbnic_pci.c
Simple merge

diff --cc drivers/net/ethernet/realtek/rtase/rtase_main.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/dev.h
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/sched/sch_cake.c
index deb0925f536dda69469738e45e1dbf8ed59a6820,2c2e2a67f3b244404eaf2ca0dabf907b1e4a162c..48dd8c88903feba5194f419ac33fb4544c1264a8
--- 1/net/sched/sch_cake.c
--- 2/net/sched/sch_cake.c
+++ b/net/sched/sch_cake.c
@@@ -1935,8 -1972,6 +1974,7 @@@ static struct sk_buff *cake_dequeue(str
  {
        struct cake_sched_data *q = qdisc_priv(sch);
        struct cake_tin_data *b = &q->tins[q->cur_tin];
-       struct cake_host *srchost, *dsthost;
 +      enum skb_drop_reason reason;
        ktime_t now = ktime_get();
        struct cake_flow *flow;
        struct list_head *head;

diff --cc net/tls/tls_sw.c
Simple merge