From: David S. Miller <davem@davemloft.net>
Date: Mon, 30 Mar 2020 04:25:29 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v5.7-rc1~146^2~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f0b5989745c3e0e92424d36869a97e4e8df7ab13;p=thirdparty%2Fkernel%2Flinux.git

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

Minor comment conflict in mac80211.

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

f0b5989745c3e0e92424d36869a97e4e8df7ab13
diff --cc drivers/net/ethernet/realtek/r8169_main.c
index 7949ec63a92f8,791d99b9e1cf4..9971135a7ab5e
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@@ -5339,20 -5449,10 +5346,11 @@@ done
  static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
  {
  	struct rtl8169_private *tp;
 +	int jumbo_max, region, rc;
 +	enum mac_version chipset;
  	struct net_device *dev;
 -	int chipset, region;
 -	int jumbo_max, rc;
 +	u16 xid;
  
- 	/* Some tools for creating an initramfs don't consider softdeps, then
- 	 * r8169.ko may be in initramfs, but realtek.ko not. Then the generic
- 	 * PHY driver is used that doesn't work with most chip versions.
- 	 */
- 	if (!driver_find("RTL8201CP Ethernet", &mdio_bus_type)) {
- 		dev_err(&pdev->dev, "realtek.ko not loaded, maybe it needs to be added to initramfs?\n");
- 		return -ENOENT;
- 	}
- 
  	dev = devm_alloc_etherdev(&pdev->dev, sizeof (*tp));
  	if (!dev)
  		return -ENOMEM;