From: Steffen Klassert <steffen.klassert@secunet.com>
To: David Ahern <dsahern@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
"David S. Miller" <davem@davemloft.net>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Florian Westphal <fw@strlen.de>
Subject: Re: linux-next: manual merge of the ipsec-next tree with Linus' tree
Date: Tue, 16 Jun 2020 18:23:50 +0200 [thread overview]
Message-ID: <20200616162350.GK13121@gauss3.secunet.de> (raw)
In-Reply-To: <2aab8efc-783d-8502-d268-ab435f566b06@gmail.com>
On Tue, Jun 16, 2020 at 07:39:30AM -0600, David Ahern wrote:
> >
> > Indeed. I must have been looking at -net. Both -net and -net-next have
> > it conditional, so yes a fixup patch is needed.
> >
>
> I see that both net and net-next still have the conditional in xfrm_output:
>
> #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
>
> Did you submit the merge fix? If not, I can do it today.
I still have it in the ipsec tree, I'll do a pull request
this week. The fixup will go to the net tree then. It should
be already in linux-next.
next prev parent reply other threads:[~2020-06-16 16:23 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
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 [this message]
-- 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=20200616162350.GK13121@gauss3.secunet.de \
--to=steffen.klassert@secunet.com \
--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=sfr@canb.auug.org.au \
/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).