linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Steffen Klassert <steffen.klassert@secunet.com>,
	David Miller <davem@davemloft.net>,
	Networking <netdev@vger.kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Julian Anastasov <ja@ssi.bg>, Florian Westphal <fw@strlen.de>
Subject: linux-next: manual merge of the ipsec-next tree with the net-next tree
Date: Mon, 13 Feb 2017 10:25:31 +1100	[thread overview]
Message-ID: <20170213102531.60d3f36d@canb.auug.org.au> (raw)

Hi Steffen,

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

  net/xfrm/xfrm_policy.c

between commit:

  63fca65d0863 ("net: add confirm_neigh method to dst_ops")

from the net-next tree and commits:

  3d7d25a68ea5 ("xfrm: policy: remove garbage_collect callback")
  a2817d8b279b ("xfrm: policy: remove family field")

from the ipsec-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/xfrm/xfrm_policy.c
index f68d75766d51,04ed1a1ae019..000000000000
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@@ -2856,32 -2843,15 +2843,32 @@@ static struct neighbour *xfrm_neigh_loo
  	return dst->path->ops->neigh_lookup(dst, skb, daddr);
  }
  
 +static void xfrm_confirm_neigh(const struct dst_entry *dst, const void *daddr)
 +{
 +	const struct dst_entry *path = dst->path;
 +
 +	for (; dst != path; dst = dst->child) {
 +		const struct xfrm_state *xfrm = dst->xfrm;
 +
 +		if (xfrm->props.mode == XFRM_MODE_TRANSPORT)
 +			continue;
 +		if (xfrm->type->flags & XFRM_TYPE_REMOTE_COADDR)
 +			daddr = xfrm->coaddr;
 +		else if (!(xfrm->type->flags & XFRM_TYPE_LOCAL_COADDR))
 +			daddr = &xfrm->id.daddr;
 +	}
 +	path->ops->confirm_neigh(path, daddr);
 +}
 +
- int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
+ int xfrm_policy_register_afinfo(const struct xfrm_policy_afinfo *afinfo, int family)
  {
  	int err = 0;
- 	if (unlikely(afinfo == NULL))
- 		return -EINVAL;
- 	if (unlikely(afinfo->family >= NPROTO))
+ 
+ 	if (WARN_ON(family >= ARRAY_SIZE(xfrm_policy_afinfo)))
  		return -EAFNOSUPPORT;
+ 
  	spin_lock(&xfrm_policy_afinfo_lock);
- 	if (unlikely(xfrm_policy_afinfo[afinfo->family] != NULL))
+ 	if (unlikely(xfrm_policy_afinfo[family] != NULL))
  		err = -EEXIST;
  	else {
  		struct dst_ops *dst_ops = afinfo->dst_ops;
@@@ -2899,11 -2869,7 +2886,9 @@@
  			dst_ops->link_failure = xfrm_link_failure;
  		if (likely(dst_ops->neigh_lookup == NULL))
  			dst_ops->neigh_lookup = xfrm_neigh_lookup;
 +		if (likely(!dst_ops->confirm_neigh))
 +			dst_ops->confirm_neigh = xfrm_confirm_neigh;
- 		if (likely(afinfo->garbage_collect == NULL))
- 			afinfo->garbage_collect = xfrm_garbage_collect_deferred;
- 		rcu_assign_pointer(xfrm_policy_afinfo[afinfo->family], afinfo);
+ 		rcu_assign_pointer(xfrm_policy_afinfo[family], afinfo);
  	}
  	spin_unlock(&xfrm_policy_afinfo_lock);
  

             reply	other threads:[~2017-02-12 23:25 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-12 23:25 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-05-19  3:27 Stephen Rothwell
2019-12-15 23:38 Stephen Rothwell
2018-04-30  0:35 Stephen Rothwell
2014-01-09  2:41 Stephen Rothwell
2013-09-24  2:16 Stephen Rothwell
2013-09-24 10:25 ` Steffen Klassert
2013-09-24 23:59   ` Stephen Rothwell
2013-09-25  5:29     ` Steffen Klassert
2013-09-27  2:01       ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170213102531.60d3f36d@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=davem@davemloft.net \
    --cc=fw@strlen.de \
    --cc=ja@ssi.bg \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=steffen.klassert@secunet.com \
    --subject='Re: linux-next: manual merge of the ipsec-next tree with the net-next tree' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).