Hi all,

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

  net/ipv4/icmp.c

between commit:

  fde29fd934932 ("ipv4: icmp: fix null-ptr-deref in icmp_build_probe()")

from the net tree and commit:

  d98adfbdd5c01 ("ipv4: drop ipv6_stub usage and use direct function calls")

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/ipv4/icmp.c
index 4e2a6c70dcd84,2f4fac22d1aba..0000000000000
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@@ -1345,14 -1342,7 +1342,15 @@@ bool icmp_build_probe(struct sk_buff *s
  		case ICMP_AFI_IP6:
  			if (iio->ident.addr.ctype3_hdr.addrlen != sizeof(struct in6_addr))
  				goto send_mal_query;
- 			dev = ipv6_stub->ipv6_dev_find(net, &iio->ident.addr.ip_addr.ipv6_addr, dev);
+ 			dev = ipv6_dev_find(net, &iio->ident.addr.ip_addr.ipv6_addr, dev);
++
 +			/*
 +			 * If IPv6 identifier lookup is unavailable, silently
 +			 * discard the request instead of misreporting NO_IF.
 +			 */
 +			if (IS_ERR(dev))
 +				return false;
 +
  			dev_hold(dev);
  			break;
  #endif