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

[Mark Brown]

Hi all,

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

  net/core/neighbour.c

between commits:

  979aabdad8dd0 ("neighbour: Skip default parms when resumed in neightbl_dump_info().")
  7b430fcfc972f ("neighbour: Don't render blackhole_netdev via RTM_GETNEIGHTBL.")

from the net tree and commit:

  fae1c59810b86 ("neighbour: Remove unnecessary net_eq().")

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.

diff --cc net/core/neighbour.c
index 7448320f7ad52,27602bcbeb691..0000000000000
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@@ -2620,15 -2659,9 +2669,12 @@@ static int neightbl_dump_info(struct sk
  				       NLM_F_MULTI) < 0)
  			break;
  
 -		nidx = 0;
 -		p = list_next_entry(&tbl->parms, list);
 -		list_for_each_entry_from_rcu(p, &tbl->parms_list, list) {
 +		default_skip = 1;
 +
 +		list_for_each_entry_rcu(p, &tbl->parms_list, list) {
- 			if (!net_eq(neigh_parms_net(p), net))
- 				continue;
- 
 +			if (!p->dev || p->dev == blackhole_netdev)
 +				continue;
 +
  			if (nidx < neigh_skip)
  				goto next;

Attachment: signature.asc
Description: PGP signature