2023-10-18 23:13:14

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: duplicate patches in the vfs-brauner tree

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


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2023-10-19 05:37:06

by Amir Goldstein

[permalink] [raw]
Subject: Re: linux-next: duplicate patches in the vfs-brauner tree

On Thu, Oct 19, 2023 at 2:12 AM Stephen Rothwell <[email protected]> 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.

2023-10-19 09:18:41

by Christian Brauner

[permalink] [raw]
Subject: Re: linux-next: duplicate patches in the vfs-brauner tree

> 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.