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

Per-next-PR merge.

net/smc/af_smc.c
  b5dd4d698171 ("net/smc: llc_conf_mutex refactor, replace it with rw_semaphore")
  e40b801b3603 ("net/smc: fix potential panic dues to unprotected smc_llc_srv_add_link()")
https://lore.kernel.org/all/20230221124008.6303c330@canb.auug.org.au/

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

diff --cc MAINTAINERS
index 20b25511e18d2ea108d5a54b3459bee49a355488,1ba493cb777fb60187620559f764a7d83e4f0be6..4df1a6e89fe70a2b723e8a6395ea93e5a3b1ee93
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4814,11 -4807,12 +4814,11 @@@ F:   net/sched/sch_etf.
  F:    net/sched/sch_taprio.c
  
  CC2520 IEEE-802.15.4 RADIO DRIVER
- M:    Varka Bhadram <varkabhadram@gmail.com>
+ M:    Stefan Schmidt <stefan@datenfreihafen.org>
  L:    linux-wpan@vger.kernel.org
- S:    Maintained
+ S:    Odd Fixes
  F:    Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
  F:    drivers/net/ieee802154/cc2520.c
 -F:    include/linux/spi/cc2520.h
  
  CCREE ARM TRUSTZONE CRYPTOCELL REE DRIVER
  M:    Gilad Ben-Yossef <gilad@benyossef.com>

diff --cc drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qede/qede_main.c
Simple merge

diff --cc net/smc/af_smc.c
index d7a7420e81ec4ce81bf2ba816ae82ab986d5eaaf,d9413d43b1045d3526805d86afacb444e035f8c6..a4cccdfdc00a242ba2334f06404e6cd663bd91de
--- 1/net/smc/af_smc.c
--- 2/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@@ -1839,8 -1826,10 +1839,10 @@@ static int smcr_serv_conf_first_link(st
        smc_llc_link_active(link);
        smcr_lgr_set_type(link->lgr, SMC_LGR_SINGLE);
  
 -      mutex_lock(&link->lgr->llc_conf_mutex);
++      down_write(&link->lgr->llc_conf_mutex);
        /* initial contact - try to establish second link */
        smc_llc_srv_add_link(link, NULL);
 -      mutex_unlock(&link->lgr->llc_conf_mutex);
++      up_write(&link->lgr->llc_conf_mutex);
        return 0;
  }
  

diff --cc net/smc/smc_core.c
Simple merge