From: David S. Miller <davem@davemloft.net>
Date: Wed, 8 May 2019 00:22:09 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v5.2-rc1~133^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a9e41a529681b38087c91ebc0bb91e12f510ca2d;p=thirdparty%2Fkernel%2Flinux.git

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

Minor conflict with the DSA legacy code removal.

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

a9e41a529681b38087c91ebc0bb91e12f510ca2d
diff --cc net/dsa/dsa.c
index 9e1fc0b082907,cb080efdc7b32..1fc782fab393c
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@@ -344,14 -344,22 +344,19 @@@ static int __init dsa_init_module(void
  
  	rc = dsa_slave_register_notifier();
  	if (rc)
- 		return rc;
+ 		goto register_notifier_fail;
  
 -	rc = dsa_legacy_register();
 -	if (rc)
 -		goto legacy_register_fail;
 -
  	dev_add_pack(&dsa_pack_type);
  
 +	dsa_tag_driver_register(&DSA_TAG_DRIVER_NAME(none_ops),
 +				THIS_MODULE);
 +
  	return 0;
+ 
 -legacy_register_fail:
 -	dsa_slave_unregister_notifier();
+ register_notifier_fail:
+ 	destroy_workqueue(dsa_owq);
+ 
+ 	return rc;
  }
  module_init(dsa_init_module);