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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/marvell/octeontx2/af/mbox.h
Simple merge

diff --cc drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
Simple merge

diff --cc net/ethtool/ioctl.c
index 0732710a48367b6685d844b4fc5886eb1ea33edf,223dcd25d88a217b68c2283f21bcd84a5df1dfa5..5ff128eacc9bced733a7cf134ddc358dbb29a350
--- 1/net/ethtool/ioctl.c
--- 2/net/ethtool/ioctl.c
+++ b/net/ethtool/ioctl.c
@@@ -1362,10 -1306,10 +1362,11 @@@ static noinline_for_stack int ethtool_s
        if (rxfh.input_xfrm && rxfh.input_xfrm != RXH_XFRM_SYM_XOR &&
            rxfh.input_xfrm != RXH_XFRM_NO_CHANGE)
                return -EINVAL;
-       if ((rxfh.input_xfrm & RXH_XFRM_SYM_XOR) &&
+       if (rxfh.input_xfrm != RXH_XFRM_NO_CHANGE &&
+           (rxfh.input_xfrm & RXH_XFRM_SYM_XOR) &&
            !ops->cap_rss_sym_xor_supported)
                return -EOPNOTSUPP;
 +      create = rxfh.rss_context == ETH_RXFH_CONTEXT_ALLOC;
  
        /* If either indir, hash key or function is valid, proceed further.
         * Must request at least one change: indir size, hash key, function