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

Cross-merge networking fixes after downstream PR.

No conflicts.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_vf_lib.c
Simple merge

diff --cc drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c
Simple merge

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

diff --cc drivers/net/ethernet/renesas/rswitch.c
Simple merge

diff --cc include/linux/ieee80211.h
Simple merge

diff --cc include/net/cfg80211.h
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge

diff --cc tools/net/ynl/ynl-gen-c.py
Simple merge

diff --cc tools/testing/selftests/net/cmsg_sender.c
index 8d7575389f58513a6e70f456657bedcc2f9d11c0,6ff3e732f449f949add1bae24657c31e8dba493f..c79e65581dc379ecddcc7177b7a6406c68b6c551
--- 1/tools/testing/selftests/net/cmsg_sender.c
--- 2/tools/testing/selftests/net/cmsg_sender.c
+++ b/tools/testing/selftests/net/cmsg_sender.c
@@@ -428,12 -416,11 +428,12 @@@ int main(int argc, char *argv[]
  {
        struct addrinfo hints, *ai;
        struct iovec iov[1];
+       unsigned char *buf;
        struct msghdr msg;
        char cbuf[1024];
-       char *buf;
        int err;
        int fd;
 +      int i;
  
        cs_parse_args(argc, argv);