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

Lots of overlapping changes and parallel additions, stuff
like that.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
Simple merge

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

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

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

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

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

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

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

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

diff --cc drivers/net/ethernet/microchip/lan743x_ptp.c
index e177b1a,e8fe9a9..afe5246
--- 1/drivers/net/ethernet/microchip/lan743x_ptp.c
--- 2/drivers/net/ethernet/microchip/lan743x_ptp.c
+++ b/drivers/net/ethernet/microchip/lan743x_ptp.c
@@@ -488,17 -427,14 +488,21 @@@ static int lan743x_ptp_perout(struct la
        u32 start_sec = 0, start_nsec = 0;
        u32 general_config = 0;
        int pulse_width = 0;
 -      int perout_bit = 0;
 +      int perout_pin = 0;
 +      unsigned int index = perout_request->index;
 +      struct lan743x_ptp_perout *perout = &ptp->perout[index];
  
 -      if (perout->flags)
+       /* Reject requests with unsupported flags */
 -      if (!on) {
 -              lan743x_ptp_perout_off(adapter);
++      if (perout_request->flags)
+               return -EOPNOTSUPP;
+ 
 +      if (on) {
 +              perout_pin = ptp_find_pin(ptp->ptp_clock, PTP_PF_PEROUT,
 +                                        perout_request->index);
 +              if (perout_pin < 0)
 +                      return -EBUSY;
 +      } else {
 +              lan743x_ptp_perout_off(adapter, index);
                return 0;
        }
  

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

diff --cc drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/hwif.h
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c
Simple merge

diff --cc include/uapi/linux/devlink.h
index b558ea8,a8a2174..ae37fd4
--- 1/include/uapi/linux/devlink.h
--- 2/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@@ -421,10 -421,7 +421,11 @@@ enum devlink_attr 
  
        DEVLINK_ATTR_RELOAD_FAILED,                     /* u8 0 or 1 */
  
- 
+       DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS_NS,        /* u64 */
++
 +      DEVLINK_ATTR_NETNS_FD,                  /* u32 */
 +      DEVLINK_ATTR_NETNS_PID,                 /* u32 */
 +      DEVLINK_ATTR_NETNS_ID,                  /* u32 */
        /* add new attributes above here, update the policy in devlink.c */
  
        __DEVLINK_ATTR_MAX,

diff --cc net/core/devlink.c
index 1338f5f,93905dc..4c63c9a
--- 1/net/core/devlink.c
--- 2/net/core/devlink.c
+++ b/net/core/devlink.c
@@@ -2809,10 -2697,9 +2809,10 @@@ static int devlink_reload(struct devlin
  static int devlink_nl_cmd_reload(struct sk_buff *skb, struct genl_info *info)
  {
        struct devlink *devlink = info->user_ptr[0];
 +      struct net *dest_net = NULL;
        int err;
  
-       if (!devlink_reload_supported(devlink))
+       if (!devlink_reload_supported(devlink) || !devlink->reload_enabled)
                return -EOPNOTSUPP;
  
        err = devlink_resources_validate(devlink, NULL, info);

diff --cc net/dsa/tag_8021q.c
index 73632d2,9e5a883..2fb6c26
--- 1/net/dsa/tag_8021q.c
--- 2/net/dsa/tag_8021q.c
+++ b/net/dsa/tag_8021q.c
@@@ -102,10 -103,10 +102,10 @@@ static int dsa_8021q_restore_pvid(struc
        if (!dsa_is_user_port(ds, port))
                return 0;
  
 -      slave = ds->ports[port].slave;
 +      slave = dsa_to_port(ds, port)->slave;
  
        err = br_vlan_get_pvid(slave, &pvid);
-       if (err < 0)
+       if (!pvid || err < 0)
                /* There is no pvid on the bridge for this port, which is
                 * perfectly valid. Nothing to restore, bye-bye!
                 */

diff --cc net/ipv4/ipmr.c
Simple merge

diff --cc net/rds/ib_cm.c
index 6b345c8,18c6fac..c71f432
--- 1/net/rds/ib_cm.c
--- 2/net/rds/ib_cm.c
+++ b/net/rds/ib_cm.c
@@@ -513,8 -450,8 +513,9 @@@ static int rds_ib_setup_qp(struct rds_c
        struct ib_qp_init_attr attr;
        struct ib_cq_init_attr cq_attr = {};
        struct rds_ib_device *rds_ibdev;
+       unsigned long max_wrs;
        int ret, fr_queue_space;
 +      struct dma_pool *pool;
  
        /*
         * It's normal to see a null device if an incoming connection races

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

diff --cc net/tipc/core.c
Simple merge

diff --cc net/tipc/core.h
index 775848a,3042f65..631d83c
--- 1/net/tipc/core.h
--- 2/net/tipc/core.h
+++ b/net/tipc/core.h
@@@ -59,8 -59,13 +59,14 @@@
  #include <net/netns/generic.h>
  #include <linux/rhashtable.h>
  #include <net/genetlink.h>
 +#include <net/netns/hash.h>
  
+ #ifdef pr_fmt
+ #undef pr_fmt
+ #endif
+ 
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+ 
  struct tipc_node;
  struct tipc_bearer;
  struct tipc_bc_base;