www.infradead.org Git - users/willy/xarray.git/commit

author	Jakub Kicinski <kuba@kernel.org>
	Sat, 13 Jul 2024 05:17:55 +0000 (22:17 -0700)
committer	Jakub Kicinski <kuba@kernel.org>
	Sat, 13 Jul 2024 05:20:30 +0000 (22:20 -0700)
commit	e5abd12f3df13e92e2fb3c02fe825aa6c57f8306
tree	b61be7584dff0f15524cb1b97abf6efe1f626885	tree
parent	75fd6079326da816caba51f9a4192c1876f37423	commit \| diff
parent	528dd46d0fc35c0176257a13a27d41e44fcc6cb3	commit \| diff

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

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  f7ce5eb2cb79 ("bnxt_en: Fix crash in bnxt_get_max_rss_ctx_ring()")
  20c8ad72eb7f ("eth: bnxt: use the RSS context XArray instead of the local list")

Adjacent changes:

net/ethtool/ioctl.c
  503757c80928 ("net: ethtool: Fix RSS setting")
  eac9122f0c41 ("net: ethtool: record custom RSS contexts in the XArray")

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/octeontx2/af/mbox.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c	diff1 \|	diff2 \|	blob \| history
net/ethtool/ioctl.c	diff1 \|	diff2 \|	blob \| history