net: re-solve some conflicts after net -> net-next merge

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

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 5cf7e5a367f0a8f8161527a4f32cfe175fe0bc65..1c0e4beb56e7724e2b5915d9ab98e9ac4710b53b 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -2294,8 +2294,9 @@ static int ibmvnic_reset(struct ibmvnic_adapter *adapter,
        unsigned long flags;
        int ret;
 
-       /*
-        * If failover is pending don't schedule any other reset.
+       spin_lock_irqsave(&adapter->rwi_lock, flags);
+
+       /* If failover is pending don't schedule any other reset.
         * Instead let the failover complete. If there is already a
         * a failover reset scheduled, we will detect and drop the
         * duplicate reset when walking the ->rwi_list below.

diff --git a/drivers/net/ethernet/ibm/ibmvnic.h b/drivers/net/ethernet/ibm/ibmvnic.h
index e4dcc63b9710bc475b61cda9d3810dda8e05f84e..806aa75a4e869d4b8368fec204ebef34367f54aa 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.h
+++ b/drivers/net/ethernet/ibm/ibmvnic.h
@@ -1081,13 +1081,15 @@ struct ibmvnic_adapter {
 
        struct tasklet_struct tasklet;
        enum vnic_state state;
-       /* Used for serializatin of state field */
+       /* Used for serialization of state field. When taking both state
+        * and rwi locks, take state lock first.
+        */
        spinlock_t state_lock;
        enum ibmvnic_reset_reason reset_reason;
-       /* when taking both state and rwi locks, take state lock first */
-       spinlock_t rwi_lock;
        struct list_head rwi_list;
-       /* Used for serialization of rwi_list */
+       /* Used for serialization of rwi_list. When taking both state
+        * and rwi locks, take state lock first
+        */
        spinlock_t rwi_lock;
        struct work_struct ibmvnic_reset;
        struct delayed_work ibmvnic_delayed_reset;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 39acbc83682d3d0ffeab07c7d9c00c3ed4c16c1c..ec2fcb2a297755f2325e160abb1408aa6205b23e 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -2123,12 +2123,7 @@ static void mlx5e_build_rq_frags_info(struct mlx5_core_dev *mdev,
        u32 buf_size = 0;
        int i;
 
-<<<<<<< HEAD
-       if (MLX5_IPSEC_DEV(mdev))
-=======
-#ifdef CONFIG_MLX5_EN_IPSEC
        if (mlx5_fpga_is_ipsec_device(mdev))
->>>>>>> 3af409ca278d4a8d50e91f9f7c4c33b175645cf3
                byte_count += MLX5E_METADATA_ETHER_LEN;
 
        if (mlx5e_rx_is_linear_skb(params, xsk)) {

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 9ce98e3d3f9f7a5245e707d20e274b5b10d4f394..cbc30df4e08a45b250f6ac1f4d8a2ed3626886df 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -2230,31 +2230,6 @@ static void rtl_prepare_power_down(struct rtl8169_private *tp)
                phy_speed_down(tp->phydev, false);
                rtl_wol_enable_rx(tp);
        }
-
-       switch (tp->mac_version) {
-       case RTL_GIGA_MAC_VER_25 ... RTL_GIGA_MAC_VER_26:
-       case RTL_GIGA_MAC_VER_29 ... RTL_GIGA_MAC_VER_30:
-       case RTL_GIGA_MAC_VER_32 ... RTL_GIGA_MAC_VER_33:
-       case RTL_GIGA_MAC_VER_37:
-       case RTL_GIGA_MAC_VER_39:
-       case RTL_GIGA_MAC_VER_43:
-       case RTL_GIGA_MAC_VER_44:
-       case RTL_GIGA_MAC_VER_45:
-       case RTL_GIGA_MAC_VER_46:
-       case RTL_GIGA_MAC_VER_47:
-       case RTL_GIGA_MAC_VER_48:
-       case RTL_GIGA_MAC_VER_50 ... RTL_GIGA_MAC_VER_63:
-               RTL_W8(tp, PMCH, RTL_R8(tp, PMCH) & ~0x80);
-               break;
-       case RTL_GIGA_MAC_VER_40:
-       case RTL_GIGA_MAC_VER_41:
-       case RTL_GIGA_MAC_VER_49:
-               rtl_eri_clear_bits(tp, 0x1a8, 0xfc000000);
-               RTL_W8(tp, PMCH, RTL_R8(tp, PMCH) & ~0x80);
-               break;
-       default:
-               break;
-       }
 }
 
 static void rtl_init_rxcfg(struct rtl8169_private *tp)

diff --git a/tools/testing/selftests/net/forwarding/tc_flower.sh b/tools/testing/selftests/net/forwarding/tc_flower.sh
index 4b58ccae34290e0721fd28ad0f6974ebcc4317bb..683711f41aa9b59f0559e0ba56851966e5189004 100755 (executable)
--- a/tools/testing/selftests/net/forwarding/tc_flower.sh
+++ b/tools/testing/selftests/net/forwarding/tc_flower.sh
@@ -3,7 +3,8 @@
 
 ALL_TESTS="match_dst_mac_test match_src_mac_test match_dst_ip_test \
        match_src_ip_test match_ip_flags_test match_pcp_test match_vlan_test \
-       match_ip_tos_test match_indev_testmatch_ip_ttl_test match_mpls_label_test \
+       match_ip_tos_test match_indev_test match_ip_ttl_test
+       match_mpls_label_test \
        match_mpls_tc_test match_mpls_bos_test match_mpls_ttl_test \
        match_mpls_lse_test"
 NUM_NETIFS=2