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

[Stephen Rothwell]

Hi all,

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

  net/ipv4/fib_semantics.c

between commit:

  747c14307214 ("ip: fix dflt addr selection for connected nexthop")

from Linus' tree and commit:

  d62607c3fe45 ("net: rename reference+tracking helpers")

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 net/ipv4/fib_semantics.c
index d9fdcbae16ee,a5439a8414d4..000000000000
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@@ -1229,8 -1230,8 +1230,8 @@@ static int fib_check_nh_nongw(struct ne
  	}
  
  	nh->fib_nh_dev = in_dev->dev;
- 	dev_hold_track(nh->fib_nh_dev, &nh->fib_nh_dev_tracker, GFP_ATOMIC);
+ 	netdev_hold(nh->fib_nh_dev, &nh->fib_nh_dev_tracker, GFP_ATOMIC);
 -	nh->fib_nh_scope = RT_SCOPE_HOST;
 +	nh->fib_nh_scope = RT_SCOPE_LINK;
  	if (!netif_carrier_ok(nh->fib_nh_dev))
  		nh->fib_nh_flags |= RTNH_F_LINKDOWN;
  	err = 0;

Attachment: pgpTeqm3YobKC.pgp
Description: OpenPGP digital signature