On 05/09/2024 12:10, Greg KH wrote:
> On Thu, Sep 05, 2024 at 11:42:21AM +0200, Matthieu Baerts wrote:
>> On 05/09/2024 11:36, Greg KH wrote:
>>> On Thu, Sep 05, 2024 at 11:33:46AM +0200, Greg KH wrote:
>>>> On Wed, Sep 04, 2024 at 05:20:59PM +0200, Matthieu Baerts wrote:
>>>>> Hi Greg,
>>>>>
>>>>> On 04/09/2024 16:38, Greg KH wrote:
>>>>>> On Wed, Sep 04, 2024 at 01:13:39PM +0200, Matthieu Baerts (NGI0) wrote:
>>>>>>> commit 20ccc7c5f7a3aa48092441a4b182f9f40418392e upstream.
>>>>>>>
>>>>>>
>>>>>> This did not apply either.
>>>>>>
>>>>>> I think I've gone through all of the 6.1 patches now. If I've missed
>>>>>> anything, please let me know.
>>>>> It looks like there are some conflicts with the patches Sasha recently
>>>>> added:
>>>>>
>>>>> queue-6.1/selftests-mptcp-add-explicit-test-case-for-remove-re.patch
>>>>> queue-6.1/selftests-mptcp-join-check-re-adding-init-endp-with-.patch
>>>>> queue-6.1/selftests-mptcp-join-check-re-using-id-of-unused-add.patch
>>>>>
>>>>> >From commit 0d8d8d5bcef1 ("Fixes for 6.1") from the stable-queue tree:
>>>>>
>>>>>
>>>>> https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=0d8d8d5bcef1
>>>>>
>>>>> I have also added these patches -- we can see patches with almost the
>>>>> same name -- but I adapted them to the v6.1 kernel: it was possible to
>>>>> apply them without conflicts, but they were causing issues because they
>>>>> were calling functions that are not available in v6.1, or taking
>>>>> different parameters.
>>>>>
>>>>> Do you mind removing the ones from Sasha please? I hope that will not
>>>>> cause any issues. After that, the two patches you had errors with should
>>>>> apply without conflicts:
>>>>
>>>> Ok, I've now dropped them, that actually fixes an error I was seeing
>>>> where we had duplicated patches in the tree.
>>>>
>>>>> - selftests: mptcp: join: validate event numbers
>>>>> - selftests: mptcp: join: check re-re-adding ID 0 signal
>>>>
>>>> I'll go add these now, thanks!
>>>
>>> I just tried, and they still fail to apply. How about we wait for this
>>> next 6.1.y release to happen and then you rebase and see what I messed
>>> up and send me the remaining ones as this is getting confusing on my
>>> end...
>>
>> Thank you for having tried!
>>
>> Sure, no problem, I can wait.
>>
>> I just hope the previous patches I sent have been applied properly. I
>> mean: I don't know how quilt handled the duplicated patches with
>> different content.
>>
>> If you prefer, we can also drop all the MPTCP related patches -- or only
>> the ones related to the selftests -- and I send the whole series I have
>> on my side: it is still on top of the v6.1.108-rc1, so without the
>> patches Sasha backported yesterday.
>
> Let's see how this -rc release looks, if it's broken or messed up, I can
> easily drop patches as needed.
Sounds good to me. I will check this RC before looking at the remaining
failed backports.
Thank you for your support!
Cheers,
Matt
--
Sponsored by the NGI0 Core fund.
