linux-next: manual merge of the net-next tree with the net tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  drivers/net/dsa/microchip/ksz9477.c

between commit:

  edecfa98f602 ("net: dsa: microchip: look for phy-mode in port nodes")

from the net tree and commit:

  805a7e6f5388 ("net: dsa: microchip: Improve phy mode message")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/dsa/microchip/ksz9477.c
index 2f5506ac7d19,b62dd64470a8..000000000000
--- a/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@@ -1229,12 -1229,15 +1229,15 @@@ static void ksz9477_port_setup(struct k
  			ksz9477_set_gbit(dev, true, &data8);
  			data8 &= ~PORT_RGMII_ID_IG_ENABLE;
  			data8 &= ~PORT_RGMII_ID_EG_ENABLE;
 -			if (dev->interface == PHY_INTERFACE_MODE_RGMII_ID ||
 -			    dev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
 +			if (p->interface == PHY_INTERFACE_MODE_RGMII_ID ||
 +			    p->interface == PHY_INTERFACE_MODE_RGMII_RXID)
  				data8 |= PORT_RGMII_ID_IG_ENABLE;
 -			if (dev->interface == PHY_INTERFACE_MODE_RGMII_ID ||
 -			    dev->interface == PHY_INTERFACE_MODE_RGMII_TXID)
 +			if (p->interface == PHY_INTERFACE_MODE_RGMII_ID ||
 +			    p->interface == PHY_INTERFACE_MODE_RGMII_TXID)
  				data8 |= PORT_RGMII_ID_EG_ENABLE;
+ 			/* On KSZ9893, disable RGMII in-band status support */
+ 			if (dev->features & IS_9893)
+ 				data8 &= ~PORT_MII_MAC_MODE;
  			p->phydev.speed = SPEED_1000;
  			break;
  		}
@@@ -1276,22 -1280,21 +1281,30 @@@ static void ksz9477_config_cpu_port(str
  			 * note the difference to help debugging.
  			 */
  			interface = ksz9477_get_interface(dev, i);
 -			if (!dev->interface)
 -				dev->interface = interface;
 -			if (interface && interface != dev->interface) {
 +			if (!p->interface) {
 +				if (dev->compat_interface) {
 +					dev_warn(dev->dev,
 +						 "Using legacy switch \"phy-mode\" property, because it is missing on port %d node. "
 +						 "Please update your device tree.\n",
 +						 i);
 +					p->interface = dev->compat_interface;
 +				} else {
 +					p->interface = interface;
 +				}
 +			}
- 			if (interface && interface != p->interface)
- 				dev_info(dev->dev,
- 					 "use %s instead of %s\n",
- 					  phy_modes(p->interface),
- 					  phy_modes(interface));
++			if (interface && interface != p->interface) {
+ 				prev_msg = " instead of ";
+ 				prev_mode = phy_modes(interface);
+ 			} else {
+ 				prev_msg = "";
+ 				prev_mode = "";
+ 			}
+ 			dev_info(dev->dev,
+ 				 "Port%d: using phy mode %s%s%s\n",
+ 				 i,
 -				 phy_modes(dev->interface),
++				 phy_modes(p->interface),
+ 				 prev_msg,
+ 				 prev_mode);
  
  			/* enable cpu port */
  			ksz9477_port_setup(dev, i, true);

Attachment: pgpsAZvcvQsh8.pgp
Description: OpenPGP digital signature