From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "David S. Miller" <davem@davemloft.net>
Cc: Steffen Klassert <steffen.klassert@secunet.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
David Ahern <dsahern@gmail.com>, Florian Westphal <fw@strlen.de>
Subject: Re: linux-next: manual merge of the ipsec-next tree with Linus' tree
Date: Tue, 2 Jun 2020 09:20:40 +1000 [thread overview]
Message-ID: <20200602092040.5ef52300@canb.auug.org.au> (raw)
In-Reply-To: <20200511130015.37103884@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2091 bytes --]
Hi Dave,
On Mon, 11 May 2020 13:00:15 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the ipsec-next tree got conflicts in:
>
> net/ipv4/xfrm4_output.c
> net/ipv6/xfrm6_output.c
>
> between commit:
>
> 0c922a4850eb ("xfrm: Always set XFRM_TRANSFORMED in xfrm{4,6}_output_finish")
>
> from Linus' tree and commit:
>
> 2ab6096db2f1 ("xfrm: remove output_finish indirection from xfrm_state_afinfo")
>
> from the ipsec-next tree.
>
> I fixed it up (I used the latter versions of these files and then added
> the following patch) 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.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 11 May 2020 12:57:24 +1000
> Subject: [PATCH] xfrm: merge fixup for "remove output_finish indirection from xfrm_state_afinfo"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> net/xfrm/xfrm_output.c | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
> index 886a9b284b3a..0f4b3a5e02ba 100644
> --- a/net/xfrm/xfrm_output.c
> +++ b/net/xfrm/xfrm_output.c
> @@ -574,16 +574,12 @@ int xfrm_output(struct sock *sk, struct sk_buff *skb)
> switch (x->outer_mode.family) {
> case AF_INET:
> memset(IPCB(skb), 0, sizeof(*IPCB(skb)));
> -#ifdef CONFIG_NETFILTER
> IPCB(skb)->flags |= IPSKB_XFRM_TRANSFORMED;
> -#endif
> break;
> case AF_INET6:
> memset(IP6CB(skb), 0, sizeof(*IP6CB(skb)));
>
> -#ifdef CONFIG_NETFILTER
> IP6CB(skb)->flags |= IP6SKB_XFRM_TRANSFORMED;
> -#endif
> break;
> }
>
It looks like this merge resolution fix up was missed when the
ipsec-next tree was merged into the net-next tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-06-01 23:20 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-11 3:00 linux-next: manual merge of the ipsec-next tree with Linus' tree Stephen Rothwell
2020-06-01 23:20 ` Stephen Rothwell [this message]
2020-06-02 2:30 ` David Ahern
2020-06-04 1:26 ` Stephen Rothwell
2020-06-04 2:55 ` David Ahern
2020-06-04 6:41 ` Steffen Klassert
2020-06-04 12:44 ` David Ahern
2020-06-05 9:18 ` Steffen Klassert
2020-06-16 13:39 ` David Ahern
2020-06-16 16:23 ` Steffen Klassert
-- strict thread matches above, loose matches on Subject: below --
2013-09-02 3:40 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=20200602092040.5ef52300@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=dsahern@gmail.com \
--cc=fw@strlen.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=steffen.klassert@secunet.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).