linux-next: duplicate patches in the vfs-brauner tree

linux-next: duplicate patches in the vfs-brauner tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 470 bytes --]

Hi all,

The following commits are also in the overlayfs tree as different
commits (but the same patches):

  b8a42d441199 ("fs: export mnt_{get,put}_write_access() to modules")
  5363f9742437 ("fs: rename __mnt_{want,drop}_write*() helpers")

These are commits

  ddf9e2ff67a9 ("fs: export mnt_{get,put}_write_access() to modules")
  3e15dcf77b23 ("fs: rename __mnt_{want,drop}_write*() helpers")

in the overlayfs tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patches in the vfs-brauner tree

[Amir Goldstein]

On Thu, Oct 19, 2023 at 2:12 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> The following commits are also in the overlayfs tree as different
> commits (but the same patches):
>
>   b8a42d441199 ("fs: export mnt_{get,put}_write_access() to modules")
>   5363f9742437 ("fs: rename __mnt_{want,drop}_write*() helpers")
>
> These are commits
>
>   ddf9e2ff67a9 ("fs: export mnt_{get,put}_write_access() to modules")
>   3e15dcf77b23 ("fs: rename __mnt_{want,drop}_write*() helpers")
>
> in the overlayfs tree.
>

Christian,

Did you apply those commits by mistake when you rebased vfs.misc
instead of merging vfs.mount.write into vfs.misc as it was prior to rebase?

Maybe it would be easier to rebase vfs.misc over vfs.mount.write?
with the intention of including these two patches inside a larger PR?

ATM, overlayfs-next relies on two vfs branches as being stable:
vfs.mount.write and vfs.xattr.

It's not a problem for me to rebase on any other stable branches
that include those changes if you wish to reorganize the vfs topic
branches differently.

Thanks,
Amir.

Re: linux-next: duplicate patches in the vfs-brauner tree

[Christian Brauner]

> Maybe it would be easier to rebase vfs.misc over vfs.mount.write?

So I've now rebased vfs.misc onto vfs.mount.write.
Thanks for the report.

Re: linux-next: duplicate patches in the vfs-brauner tree

[Christian Brauner]

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.

Re: linux-next: duplicate patches in the vfs-brauner tree

[Dominique Martinet]

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

Re: linux-next: duplicate patches in the vfs-brauner tree

[Christian Brauner]

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?

Re: linux-next: duplicate patches in the vfs-brauner tree

[Andrew Morton]

On Thu, 4 Apr 2024 10:10:38 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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.

Re: linux-next: duplicate patches in the vfs-brauner tree

[Dominique Martinet]

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?)

Thanks,
-- 
Dominique Martinet | Asmadeus

Re: linux-next: duplicate patches in the vfs-brauner tree

[Randy Dunlap]

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

Re: linux-next: duplicate patches in the vfs-brauner tree

[Dominique Martinet]

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

linux-next: duplicate patches in the vfs-brauner tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 482 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patches in the vfs-brauner tree

[David Howells]

Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> It looks like the afs tree has been rebased since (part of) it was merged
> into the vfs-brauner tree. :-(

What's the best way to deal with this?  Push these two patches down to the
bottom of the branches and then base both trees off those two same commits?

David

linux-next: duplicate patches in the vfs-brauner tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 583 bytes --]

Hi all,

The following commits are also in the afs tree as different commits
(but the same patches):

  a6654861bcd3 ("afs: Automatically generate trace tag enums")
  66ea28c510d7 ("afs: Remove whitespace before most ')' from the trace header")

these are commits

  88dc7a203f2b ("afs: Automatically generate trace tag enums")
  96a98801cbf3 ("afs: Remove whitespace before most ')' from the trace header")

in the afs tree.

It looks like the afs tree has been rebased since (part of) it was merged
into the vfs-brauner tree. :-(

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patches in the vfs-brauner tree

[Amir Goldstein]

On Fri, Oct 13, 2023 at 2:48 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> The following commits are also in the overlayfs tree as different commits
> (but the same patches):
>
>   149f455798a6 ("smb: move cifs_xattr_handlers to .rodata")
>   295d3c441226 ("net: move sockfs_xattr_handlers to .rodata")
>   2f5028604f08 ("shmem: move shmem_xattr_handlers to .rodata")
>   375aa21d36ee ("xfs: move xfs_xattr_handlers to .rodata")
>   3d649a4a832e ("overlayfs: move xattr tables to .rodata")
>   c08a831c74f0 ("squashfs: move squashfs_xattr_handlers to .rodata")
>   c25308c326db ("ubifs: move ubifs_xattr_handlers to .rodata")
>
> Looks like the overlatfs tree has merged a previous verion of a topic
> branch from the vfs-brauner tree.

Yeh, sorry my bad.
Christian told me that vfs.xattr branch was stable, but I did not notice
that I had merged a day old version.
Fixed now.

BTW, Christian, feel free to fast forward the stable vfs.xattr branch to
a640d888953c const_structs.checkpatch: add xattr_handler
it won't be a problem for me.

Thanks,
Amir.

linux-next: duplicate patches in the vfs-brauner tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 697 bytes --]

Hi all,

The following commits are also in the overlayfs tree as different commits
(but the same patches):

  149f455798a6 ("smb: move cifs_xattr_handlers to .rodata")
  295d3c441226 ("net: move sockfs_xattr_handlers to .rodata")
  2f5028604f08 ("shmem: move shmem_xattr_handlers to .rodata")
  375aa21d36ee ("xfs: move xfs_xattr_handlers to .rodata")
  3d649a4a832e ("overlayfs: move xattr tables to .rodata")
  c08a831c74f0 ("squashfs: move squashfs_xattr_handlers to .rodata")
  c25308c326db ("ubifs: move ubifs_xattr_handlers to .rodata")

Looks like the overlatfs tree has merged a previous verion of a topic
branch from the vfs-brauner tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]