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/phy/phy_device.c

between commit:

  2560db6ede1a ("net: phy: Fix missing of_node_put() for leds")

from the net tree and commit:

  1dce520abd46 ("net: phy: Use for_each_available_child_of_node_scoped()")

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/phy/phy_device.c
index 6bb2793de0a9,7c4a09455493..000000000000
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@@ -3343,11 -3420,9 +3420,10 @@@ static int of_phy_leds(struct phy_devic
  	if (!leds)
  		return 0;
  
- 	for_each_available_child_of_node(leds, led) {
+ 	for_each_available_child_of_node_scoped(leds, led) {
  		err = of_phy_led(phydev, led);
  		if (err) {
- 			of_node_put(led);
 +			of_node_put(leds);
  			phy_leds_unregister(phydev);
  			return err;
  		}

Attachment: pgp3IlXDggro7.pgp
Description: OpenPGP digital signature