From: Shuah Khan <skhan@linuxfoundation•org>
To: Christian Brauner <brauner@kernel•org>,
"Paul E. McKenney" <paulmck@kernel•org>, Willy Tarreau <w@1wt•eu>
Cc: "Thomas Weißschuh" <thomas@t-8ch•de>,
"Stephen Rothwell" <sfr@canb•auug.org.au>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Shuah Khan" <skhan@linuxfoundation•org>
Subject: Re: linux-next: duplicate patch in the nolibc tree
Date: Mon, 21 Aug 2023 09:52:56 -0600 [thread overview]
Message-ID: <6822c914-4f11-be93-ed55-56447a5838f9@linuxfoundation.org> (raw)
In-Reply-To: <e08e3dd5-48b8-5da2-5d0c-7d5b70a9e9be@linuxfoundation.org>
On 8/18/23 07:59, Shuah Khan wrote:
> On 8/18/23 07:27, Christian Brauner wrote:
>> On Thu, Aug 17, 2023 at 01:41:45PM -0700, Paul E. McKenney wrote:
>>> On Thu, Aug 17, 2023 at 09:39:09PM +0200, Willy Tarreau wrote:
>>>> On Thu, Aug 17, 2023 at 11:46:57AM -0700, Paul E. McKenney wrote:
>>>>> On Thu, Aug 17, 2023 at 12:27:46PM -0600, Shuah Khan wrote:
>>>>>> On 8/17/23 10:30, Thomas Weißschuh wrote:
>>>>>>> On 2023-08-17 13:38:11+1000, Stephen Rothwell wrote:
>>>>>>>> The following commit is also in the vfs-brauner tree as a different commit
>>>>>>>> (but the same patch):
>>>>>>>>
>>>>>>>> ba859b2e419c ("selftests/nolibc: drop test chmod_net")
>>>>>>>>
>>>>>>>> This is commit
>>>>>>>>
>>>>>>>> 49319832de90 ("selftests/nolibc: drop test chmod_net")
>>>>>>>>
>>>>>>>> in the vfs-brauner tree.
>>>>>>>
>>>>>>> I think we can drop the patch from the nolibc tree.
>>>>>>> The patch is only really necessary in combination with
>>>>>>> commit 18e66ae67673 ("proc: use generic setattr() for /proc/$PID/net")
>>>>>>> which already is and should stay in the vfs tree.
>>>>>>
>>>>>> Thomas,
>>>>>>
>>>>>> Do the rest of the nolibc patches build without this if we were
>>>>>> to drop this patch? Dorpping requires rebase and please see below.
>>>>>>
>>>>>> Willy, Paul,
>>>>>>
>>>>>> How do we want to handle this so we can avoid rebasing to keep
>>>>>> the Commit IDs the same as one ones in Willy's nolibc branch?
>>>>>
>>>>> The usual way would be for Willy to drop the patch, rebase, and republish
>>>>> his branch. You would then discard the current branch and pull the
>>>>> new one.
>>>>>
>>>>>> I would recommend dropping this commit from vfs-brauner if it
>>>>>> doesn't cause problems.
>>>>>
>>>>> It might be good for nolibc patches to be going through Willy's tree.
>>>>
>>>> It would indeed be more logical as a general rule. However, here I don't
>>>> care as I don't see any issue caused by dropping it, I can adapt to what
>>>> is most convenient for most of us.
>>>>
>>>> Let's maybe just wait a little bit for Christian to suggest what he
>>>> prefers then we can adapt.
>>>>
>>>>> Or does Christian have some situation where it is necessary to make
>>>>> a coordinated vfs/nolibc change?
>>>>
>>>> I don't think there's any need for coordination on this one.
>>>
>>> It is always good when either option can be make to work. ;-)
>>
>> The patch in the vfs tree will make the test fail so it makes sense to
>> have both go in together. I would normally be happy to drop it but I'm
>> rather unenthusiastic in this particular case because I replied to this
>> almost 5 weeks ago on Thursday, July 13 and since then this has been in
>> -next.
>>
>
> I totally understand you being unenthusiastic. Considering summer
> vacation schedules and all, emails get missed at times.
>
> I sincerely request you to consider dropping as it is the simpler route
> for all involved.
>
Christian,
Please let us know if my request failed to raise your enthusiasm level.
We will go to our plan b of having Willy drop the patch, resend the
pull request to me ....
thanks,
-- Shuah
next prev parent reply other threads:[~2023-08-21 15:53 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-17 3:38 linux-next: duplicate patch in the nolibc tree Stephen Rothwell
2023-08-17 16:30 ` Thomas Weißschuh
2023-08-17 18:27 ` Shuah Khan
2023-08-17 18:46 ` Paul E. McKenney
2023-08-17 19:39 ` Willy Tarreau
2023-08-17 20:41 ` Paul E. McKenney
2023-08-18 13:27 ` Christian Brauner
2023-08-18 13:59 ` Shuah Khan
2023-08-21 15:52 ` Shuah Khan [this message]
2023-08-21 16:07 ` Christian Brauner
2023-08-22 9:50 ` Willy Tarreau
2023-08-17 19:34 ` Thomas Weißschuh
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=6822c914-4f11-be93-ed55-56447a5838f9@linuxfoundation.org \
--to=skhan@linuxfoundation$(echo .)org \
--cc=brauner@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=paulmck@kernel$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=thomas@t-8ch$(echo .)de \
--cc=w@1wt$(echo .)eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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