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_N
On 6/4/20 6:44 AM, David Ahern wrote:
> On 6/4/20 12:41 AM, Steffen Klassert wrote:
>> On Wed, Jun 03, 2020 at 08:55:01PM -0600, David Ahern wrote:
>>> On 6/3/20 7:26 PM, Stephen Rothwell wrote:
And now the net-next tree has been merged into Linus' tree without this
fix :-(
>>>
On Thu, Jun 04, 2020 at 06:44:10AM -0600, David Ahern wrote:
> On 6/4/20 12:41 AM, Steffen Klassert wrote:
> > On Wed, Jun 03, 2020 at 08:55:01PM -0600, David Ahern wrote:
> >> On 6/3/20 7:26 PM, Stephen Rothwell wrote:
> >>>
> >>> And now the net-next tree has been merged into Linus' tree without
On 6/4/20 12:41 AM, Steffen Klassert wrote:
> On Wed, Jun 03, 2020 at 08:55:01PM -0600, David Ahern wrote:
>> On 6/3/20 7:26 PM, Stephen Rothwell wrote:
>>>
>>> And now the net-next tree has been merged into Linus' tree without this fix
>>> :-(
>>>
>>
>> I took a look earlier and I think it is fin
On Wed, Jun 03, 2020 at 08:55:01PM -0600, David Ahern wrote:
> On 6/3/20 7:26 PM, Stephen Rothwell wrote:
> >
> > And now the net-next tree has been merged into Linus' tree without this fix
> > :-(
> >
>
> I took a look earlier and I think it is fine. Some code was moved around
> in ipsec-next
On 6/3/20 7:26 PM, Stephen Rothwell wrote:
>
> And now the net-next tree has been merged into Linus' tree without this fix
> :-(
>
I took a look earlier and I think it is fine. Some code was moved around
in ipsec-next and I think the merge is good. I'll run the test cases
later this week and do
Hi David,
On Mon, 1 Jun 2020 20:30:34 -0600 David Ahern wrote:
>
> On 6/1/20 5:20 PM, Stephen Rothwell wrote:
> > Hi Dave,
> >
> > On Mon, 11 May 2020 13:00:15 +1000 Stephen Rothwell
> > wrote:
> >>
> >> Today's linux-next merge of the ipsec-next tree got conflicts in:
> >>
> >> net/ipv4/x
On 6/1/20 5:20 PM, Stephen Rothwell wrote:
> Hi Dave,
>
> On Mon, 11 May 2020 13:00:15 +1000 Stephen Rothwell
> 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 (
Hi Dave,
On Mon, 11 May 2020 13:00:15 +1000 Stephen Rothwell
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
Hi all,
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_finis
Hi Steffen,
Today's linux-next merge of the ipsec-next tree got a conflict in
include/net/xfrm.h between commit 628e341f319f ("xfrm: make local error
reporting more robust") from Linus' tree and commit aba826958830
("{ipv4,xfrm}: Introduce xfrm_tunnel_notifier for xfrm tunnel mode
callback") from
11 matches
Mail list logo
