Hi all,
The following commits are also in the mm and v9fs trees as different
commits (but the same patches):
0e74485c814a ("nilfs2: fix out-of-range warning")
528aa74c091d ("9p: Clean up a kdoc warning.")
These are commit
93df85cc09a2 ("nilfs2: fix out-of-range warning")
from the mm-non-mm-unstable branch of the mm tree and commit
7013482ff594 ("9p/trans_fd: remove Excess kernel-doc comment")
from the v9fs tree.
--
Cheers,
Stephen Rothwell
Thanks Stephen!
[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]
Christian,
Stephen Rothwell wrote on Thu, Apr 04, 2024 at 10:10:38AM +1100:
> [...]
> 528aa74c091d ("9p: Clean up a kdoc warning.")
>
> These are commit
> [...]
> 7013482ff594 ("9p/trans_fd: remove Excess kernel-doc comment")
>
> from the v9fs tree.
Thanks for picking that commit up (assuming you did recently); I've had
it in my tree for a while and should have submitted it for 6.9-rc1 but
the other 9p tree brought a few bugs in at the same time to I had held
it off for safety, but it doesn't really make sense and I should have
sent it a while ago.
I only have a handful of patches so I can send them today/tomorrow if
you drop your's, or I can drop this one here and send the rest
shortly later to avoid further confusion.
Cheers,
--
Dominique Martinet | Asmadeus
Hi Dominique,
On 4/3/24 4:59 PM, Dominique Martinet wrote:
> Thanks Stephen!
>
> [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
HTH.
--
#Randy
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/[email protected]
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?)
Thanks,
--
Dominique Martinet | Asmadeus
On Thu, 4 Apr 2024 10:10:38 +1100 Stephen Rothwell <[email protected]> wrote:
> The following commits are also in the mm and v9fs trees as different
> commits (but the same patches):
>
> 0e74485c814a ("nilfs2: fix out-of-range warning")
> 528aa74c091d ("9p: Clean up a kdoc warning.")
>
> These are commit
>
> 93df85cc09a2 ("nilfs2: fix out-of-range warning")
>
> from the mm-non-mm-unstable branch of the mm tree
Thanks, I'll drop that patch from mm.git.
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/[email protected]
>
> 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?
Christian Brauner wrote on Fri, Apr 05, 2024 at 12:57:08PM +0200:
> > 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?
This one:
528aa74c091d ("9p: Clean up a kdoc warning.")
I'll take this as an ok, I've just sent Linus my patches, thanks!
--
Dominique Martinet | Asmadeus
On Fri, Apr 05, 2024 at 08:30:38PM +0900, Dominique Martinet wrote:
> Christian Brauner wrote on Fri, Apr 05, 2024 at 12:57:08PM +0200:
> > > 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?
>
> This one:
> 528aa74c091d ("9p: Clean up a kdoc warning.")
Ok, David will drop it.