From: David S. Miller <davem@davemloft.net>
Date: Sun, 17 Nov 2019 02:47:31 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=19b7e21c55c81713c4011278143006af9f232504;p=linux.git

Merge git://git./linux/kernel/git/netdev/net

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

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

19b7e21c55c81713c4011278143006af9f232504
diff --cc drivers/net/ethernet/microchip/lan743x_ptp.c
index e177b1ae03f1c,e8fe9a90fe4f9..afe52463dc576
--- a/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];
  
+ 	/* Reject requests with unsupported flags */
 -	if (perout->flags)
++	if (perout_request->flags)
+ 		return -EOPNOTSUPP;
+ 
 -	if (!on) {
 -		lan743x_ptp_perout_off(adapter);
 +	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 include/uapi/linux/devlink.h
index b558ea88b7666,a8a2174db0307..ae37fd4d194a7
--- a/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 1338f5fbc7d2e,93905dc7c179b..4c63c9a4c09e6
--- a/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 73632d21f1a66,9e5a883a9f0c3..2fb6c26294b50
--- a/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/rds/ib_cm.c
index 6b345c858dbac,18c6fac6ead9c..c71f4328d1386
--- a/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/tipc/core.h
index 775848a5f27e6,3042f654e0af0..631d83c9705f6
--- a/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;