2021-09-26 20:50:49

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: Fixes tag needs some work in the ipsec tree

Hi all,

In commit

93ec1320b017 ("xfrm: fix rcu lock in xfrm_notify_userpolicy()")

Fixes tag

Fixes: 703b94b93c19 ("xfrm: notify default policy on update")

has these problem(s):

- Target SHA1 does not exist

Maybe you meant

Fixes: 88d0adb5f13b ("xfrm: notify default policy on update")

--
Cheers,
Stephen Rothwell

Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2021-09-27 07:57:34

by Nicolas Dichtel

[permalink] [raw]
Subject: Re: linux-next: Fixes tag needs some work in the ipsec tree

Hi Stephen,

Le 26/09/2021 ? 22:49, Stephen Rothwell a ?crit?:
> Hi all,
>
> In commit
>
> 93ec1320b017 ("xfrm: fix rcu lock in xfrm_notify_userpolicy()")
>
> Fixes tag
>
> Fixes: 703b94b93c19 ("xfrm: notify default policy on update")
>
> has these problem(s):
>
> - Target SHA1 does not exist
>
> Maybe you meant
>
> Fixes: 88d0adb5f13b ("xfrm: notify default policy on update")
>
In fact, the sha1 comes from the ipsec tree, which is regularly rebased.
The original patch is only in this tree for now.
Steffen, maybe this fix could be squashed with the original commit?


Regards,
Nicolas

2021-09-27 11:20:57

by Steffen Klassert

[permalink] [raw]
Subject: Re: linux-next: Fixes tag needs some work in the ipsec tree

On Mon, Sep 27, 2021 at 09:55:07AM +0200, Nicolas Dichtel wrote:
> Hi Stephen,
>
> Le 26/09/2021 ? 22:49, Stephen Rothwell a ?crit?:
> > Hi all,
> >
> > In commit
> >
> > 93ec1320b017 ("xfrm: fix rcu lock in xfrm_notify_userpolicy()")
> >
> > Fixes tag
> >
> > Fixes: 703b94b93c19 ("xfrm: notify default policy on update")
> >
> > has these problem(s):
> >
> > - Target SHA1 does not exist
> >
> > Maybe you meant
> >
> > Fixes: 88d0adb5f13b ("xfrm: notify default policy on update")
> >
> In fact, the sha1 comes from the ipsec tree, which is regularly rebased.

The testing branch of the ipsec tree might be rebased if I have
a bad commit there. The master branch of the ipsec tree will not
be rebased, as this branch is publicly used.

> The original patch is only in this tree for now.
> Steffen, maybe this fix could be squashed with the original commit?

As said, I never rebased the master branch so far and would only do
so in case of emergency.

2021-09-27 12:38:23

by Nicolas Dichtel

[permalink] [raw]
Subject: Re: linux-next: Fixes tag needs some work in the ipsec tree

Le 27/09/2021 à 13:18, Steffen Klassert a écrit :
> On Mon, Sep 27, 2021 at 09:55:07AM +0200, Nicolas Dichtel wrote:
>> Hi Stephen,
>>
>> Le 26/09/2021 à 22:49, Stephen Rothwell a écrit :
>>> Hi all,
>>>
>>> In commit
>>>
>>> 93ec1320b017 ("xfrm: fix rcu lock in xfrm_notify_userpolicy()")
>>>
>>> Fixes tag
>>>
>>> Fixes: 703b94b93c19 ("xfrm: notify default policy on update")
>>>
>>> has these problem(s):
>>>
>>> - Target SHA1 does not exist
>>>
>>> Maybe you meant
>>>
>>> Fixes: 88d0adb5f13b ("xfrm: notify default policy on update")
>>>
>> In fact, the sha1 comes from the ipsec tree, which is regularly rebased.
>
> The testing branch of the ipsec tree might be rebased if I have
> a bad commit there. The master branch of the ipsec tree will not
> be rebased, as this branch is publicly used.
>
>> The original patch is only in this tree for now.
>> Steffen, maybe this fix could be squashed with the original commit?
>
> As said, I never rebased the master branch so far and would only do
> so in case of emergency.
>
Ok, thanks for the clarification and sorry for this wrong sha1, which probably
comes from my tree.



Regards,
Nicolas