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

Conflicts:

drivers/net/ethernet/intel/ice/ice_main.c
  418e53401e47 ("ice: move devlink port creation/deletion")
  643ef23bd9dd ("ice: Introduce local var for readability")
https://lore.kernel.org/all/20230127124025.0dacef40@canb.auug.org.au/
https://lore.kernel.org/all/20230124005714.3996270-1-anthony.l.nguyen@intel.com/

drivers/net/ethernet/engleder/tsnep_main.c
  3d53aaef4332 ("tsnep: Fix TX queue stop/wake for multiple queues")
  25faa6a4c5ca ("tsnep: Replace TX spin_lock with __netif_tx_lock")
https://lore.kernel.org/all/20230127123604.36bb3e99@canb.auug.org.au/

net/netfilter/nf_conntrack_proto_sctp.c
  13bd9b31a969 ("Revert "netfilter: conntrack: add sctp DATA_SENT state"")
  a44b7651489f ("netfilter: conntrack: unify established states for SCTP paths")
  f71cb8f45d09 ("netfilter: conntrack: sctp: use nf log infrastructure for invalid packets")
https://lore.kernel.org/all/20230127125052.674281f9@canb.auug.org.au/
https://lore.kernel.org/all/d36076f3-6add-a442-6d4b-ead9f7ffff86@tessares.net/

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts
Simple merge

diff --cc drivers/net/ethernet/adi/adin1110.c
Simple merge

diff --cc drivers/net/ethernet/engleder/tsnep_main.c
index e9dfefba597384565d94d688f1f4c366de2b03bf,00e2108f2ca4cb9823eae1fba44626e484ebdc81..c3cf427a9409aca387bf663d32672317a695e213
--- 1/drivers/net/ethernet/engleder/tsnep_main.c
--- 2/drivers/net/ethernet/engleder/tsnep_main.c
+++ b/drivers/net/ethernet/engleder/tsnep_main.c
@@@ -458,8 -450,10 +458,8 @@@ static netdev_tx_t tsnep_xmit_frame_rin
                /* ring full, shall not happen because queue is stopped if full
                 * below
                 */
-               netif_stop_queue(tx->adapter->netdev);
+               netif_stop_subqueue(tx->adapter->netdev, tx->queue_index);
  
 -              spin_unlock_irqrestore(&tx->lock, flags);
 -
                return NETDEV_TX_BUSY;
        }
  
@@@ -495,9 -493,11 +495,9 @@@
  
        if (tsnep_tx_desc_available(tx) < (MAX_SKB_FRAGS + 1)) {
                /* ring can get full with next frame */
-               netif_stop_queue(tx->adapter->netdev);
+               netif_stop_subqueue(tx->adapter->netdev, tx->queue_index);
        }
  
 -      spin_unlock_irqrestore(&tx->lock, flags);
 -
        return NETDEV_TX_OK;
  }
  
@@@ -701,13 -567,13 +701,13 @@@ static bool tsnep_tx_poll(struct tsnep_
        } while (likely(budget));
  
        if ((tsnep_tx_desc_available(tx) >= ((MAX_SKB_FRAGS + 1) * 2)) &&
-           netif_queue_stopped(tx->adapter->netdev)) {
-               netif_wake_queue(tx->adapter->netdev);
+           netif_tx_queue_stopped(nq)) {
+               netif_tx_wake_queue(nq);
        }
  
 -      spin_unlock_irqrestore(&tx->lock, flags);
 +      __netif_tx_unlock(nq);
  
 -      return (budget != 0);
 +      return budget != 0;
  }
  
  static bool tsnep_tx_pending(struct tsnep_tx *tx)

diff --cc drivers/net/ethernet/freescale/fec_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/iavf/iavf.h
Simple merge

diff --cc drivers/net/ethernet/intel/iavf/iavf_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/iavf/iavf_virtchnl.c
Simple merge

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

diff --cc drivers/net/ethernet/intel/ice/ice_main.c
index cb870da5c317a331e10b70dd8817c652fed2736d,237ede2cffb0aa3a646ffbd3bbedf3db0840e235..fce86e8ff83494456d8bb449052f3cd4d6a6bf65
--- 1/drivers/net/ethernet/intel/ice/ice_main.c
--- 2/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@@ -5083,7 -5090,8 +5091,8 @@@ static void ice_remove(struct pci_dev *
                ice_remove_arfs(pf);
        ice_setup_mc_magic_wake(pf);
        ice_vsi_release_all(pf);
 -      mutex_destroy(&(&pf->hw)->fdir_fltr_lock);
 +      mutex_destroy(&hw->fdir_fltr_lock);
+       ice_devlink_destroy_pf_port(pf);
        ice_set_wake(pf);
        ice_free_irq_msix_misc(pf);
        ice_for_each_vsi(pf, i) {

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

diff --cc drivers/net/mdio/mdio-mux-meson-g12a.c
Simple merge

diff --cc drivers/net/virtio_net.c
Simple merge

diff --cc drivers/scsi/iscsi_tcp.c
Simple merge

diff --cc net/netfilter/nf_conntrack_proto_sctp.c
index dbdfcc6cd2aaecf7768b1d0e8160e12ea485421b,945dd40e707731cd9a5c8b56de23507ed3a3a622..3937cbee9418612fa34686599c49336f563484cb
--- 1/net/netfilter/nf_conntrack_proto_sctp.c
--- 2/net/netfilter/nf_conntrack_proto_sctp.c
+++ b/net/netfilter/nf_conntrack_proto_sctp.c
@@@ -243,16 -238,14 +227,12 @@@ static int sctp_new_state(enum ip_connt
                i = 9;
                break;
        case SCTP_CID_HEARTBEAT_ACK:
 -              pr_debug("SCTP_CID_HEARTBEAT_ACK");
                i = 10;
                break;
-       case SCTP_CID_DATA:
-       case SCTP_CID_SACK:
-               i = 11;
-               break;
        default:
                /* Other chunks like DATA or SACK do not change the state */
 -              pr_debug("Unknown chunk type, Will stay in %s\n",
 -                       sctp_conntrack_names[cur_state]);
 +              pr_debug("Unknown chunk type %d, Will stay in %s\n",
 +                       chunk_type, sctp_conntrack_names[cur_state]);
                return cur_state;
        }
  
@@@ -386,21 -381,19 +364,21 @@@ int nf_conntrack_sctp_packet(struct nf_
  
                if (!sctp_new(ct, skb, sh, dataoff))
                        return -NF_ACCEPT;
-       } else {
-               /* Check the verification tag (Sec 8.5) */
-               if (!test_bit(SCTP_CID_INIT, map) &&
-                   !test_bit(SCTP_CID_SHUTDOWN_COMPLETE, map) &&
-                   !test_bit(SCTP_CID_COOKIE_ECHO, map) &&
-                   !test_bit(SCTP_CID_ABORT, map) &&
-                   !test_bit(SCTP_CID_SHUTDOWN_ACK, map) &&
-                   !test_bit(SCTP_CID_HEARTBEAT, map) &&
-                   !test_bit(SCTP_CID_HEARTBEAT_ACK, map) &&
-                   sh->vtag != ct->proto.sctp.vtag[dir]) {
-                       nf_ct_l4proto_log_invalid(skb, ct, state,
-                                                 "verification tag check failed %x vs %x for dir %d",
-                                                 sh->vtag, ct->proto.sctp.vtag[dir], dir);
-                       goto out;
-               }
+       }
+ 
+       /* Check the verification tag (Sec 8.5) */
+       if (!test_bit(SCTP_CID_INIT, map) &&
+           !test_bit(SCTP_CID_SHUTDOWN_COMPLETE, map) &&
+           !test_bit(SCTP_CID_COOKIE_ECHO, map) &&
+           !test_bit(SCTP_CID_ABORT, map) &&
+           !test_bit(SCTP_CID_SHUTDOWN_ACK, map) &&
+           !test_bit(SCTP_CID_HEARTBEAT, map) &&
+           !test_bit(SCTP_CID_HEARTBEAT_ACK, map) &&
+           sh->vtag != ct->proto.sctp.vtag[dir]) {
 -              pr_debug("Verification tag check failed\n");
++              nf_ct_l4proto_log_invalid(skb, ct, state,
++                                        "verification tag check failed %x vs %x for dir %d",
++                                        sh->vtag, ct->proto.sctp.vtag[dir], dir);
+               goto out;
        }
  
        old_state = new_state = SCTP_CONNTRACK_NONE;