From: Christian Brauner <brauner@kernel•org>
To: Dominique Martinet <asmadeus@codewreck•org>,
David Howells <dhowells@redhat•com>
Cc: Randy Dunlap <rdunlap@infradead•org>,
Stephen Rothwell <sfr@canb•auug.org.au>,
Andrew Morton <akpm@linux-foundation•org>,
Arnd Bergmann <arnd@arndb•de>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: duplicate patches in the vfs-brauner tree
Date: Fri, 5 Apr 2024 12:57:08 +0200 [thread overview]
Message-ID: <20240405-entkleidet-performanz-2f46c4f67751@brauner> (raw)
In-Reply-To: <Zg4F9SAGNcmKIa1v@codewreck.org>
On Thu, Apr 04, 2024 at 10:44:21AM +0900, Dominique Martinet wrote:
> Randy Dunlap wrote on Wed, Apr 03, 2024 at 05:21:01PM -0700:
> > > [off topic, I just spent 10 minutes looking for the list of urls of the
> > > repos merged into linux-next to check that 'vfs-brauner' tree commit as
> > > it doesn't appear to be in next yet, and couldn't find it as there's no
> > > "Merge branch x of ...brauner" commit in next at the moment.
> > > I'm sure it's there somewhere and I didn't look at the right place, but
> > > perhaps a link to such a list could be added to either of the following
> > > (which all describe linux-next to some level):
> > > - https://www.kernel.org/doc/man-pages/linux-next.html
> > > - Documentation/process/howto.rst
> > > - Documentation/process/2.Process.rst
> > > /off topic]
> >
> > If you look in the Next subdir in a linux-next tree, for 20240403 it shows:
> >
> > vfs-brauner git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.all
> >
> > in the Trees file and in the merge.log file it shows:
> >
> > Merging vfs-brauner/vfs.all (35c44ac8370a Merge branch 'vfs.mount.api' into vfs.all)
> > $ git merge -m Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all
>
> Thank you, I wasn't aware of this Next directory -- I'll definitely
> look there next!
>
>
> So these two commits content is identical but they are completly
> different patches from different authors (I was wondering about the
> different subject), and David never sent it as is to me as it was part
> of another commit[1] and I guess the other half got dropped on a rebase
> and I didn't notice the overlap...
>
> [1] https://lkml.kernel.org/r/20240328163424.2781320-3-dhowells@redhat.com
>
> Given this I'd favor keeping Randy's older commit in my tree, so I'll
> send it to Linus as soon as Christian gives his ok on dropping the
> patch (or I guess it doesn't really make that much sense to wait any
> longer at this point?)
The patches are part of David's larger netfs-writeback series afaict.
So what patch do you need dropped?
next prev parent reply other threads:[~2024-04-05 10:57 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-03 23:10 linux-next: duplicate patches in the vfs-brauner tree Stephen Rothwell
2024-04-03 23:59 ` Dominique Martinet
2024-04-04 0:21 ` Randy Dunlap
2024-04-04 1:44 ` Dominique Martinet
2024-04-05 10:57 ` Christian Brauner [this message]
2024-04-05 11:30 ` Dominique Martinet
2024-04-05 13:09 ` Christian Brauner
2024-04-04 2:09 ` Andrew Morton
-- strict thread matches above, loose matches on Subject: below --
2025-10-19 20:29 Stephen Rothwell
2025-01-20 22:20 Stephen Rothwell
2025-01-12 21:55 Stephen Rothwell
2025-01-05 23:10 Stephen Rothwell
2025-01-07 3:14 ` Andrew Morton
2025-01-10 11:08 ` Christian Brauner
2025-01-11 0:31 ` Andrew Morton
2024-10-20 11:08 Stephen Rothwell
2024-10-21 8:22 ` Christian Brauner
2024-10-15 22:02 Stephen Rothwell
2024-07-31 23:54 Stephen Rothwell
2024-07-24 22:00 Stephen Rothwell
2023-12-21 0:00 Stephen Rothwell
2023-12-21 10:50 ` David Howells
2023-10-18 23:12 Stephen Rothwell
2023-10-19 5:36 ` Amir Goldstein
2023-10-19 9:18 ` Christian Brauner
2023-10-12 23:48 Stephen Rothwell
2023-10-13 6:32 ` Amir Goldstein
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=20240405-entkleidet-performanz-2f46c4f67751@brauner \
--to=brauner@kernel$(echo .)org \
--cc=akpm@linux-foundation$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=asmadeus@codewreck$(echo .)org \
--cc=dhowells@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rdunlap@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/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