git.apps.os.sepia.ceph.com Git - ceph-client.git/commit

]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit

author	Jakub Kicinski <kuba@kernel.org>
	Fri, 10 Jan 2025 00:11:47 +0000 (16:11 -0800)
committer	Jakub Kicinski <kuba@kernel.org>
	Fri, 10 Jan 2025 00:11:47 +0000 (16:11 -0800)
commit	14ea4cd1b19162888f629c4ce1ba268c683b0f12
tree	8b1c111ec9daa8eebbf6262acadbe96423895ed1	tree \| snapshot
parent	dd3e8f8b9b011e31534fd5bb463e011ccccd9bbd	commit \| diff
parent	c77cd47cee041bc1664b8e5fcd23036e5aab8e2a	commit \| diff

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>

13 files changed:

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_adminq_cmd.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/meta/fbnic/fbnic.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/meta/fbnic/fbnic_pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/rtase/rtase_main.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_cake.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_sw.c	diff1 \|	diff2 \|	blob \| history