2023-10-12 23:48:50

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

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


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

2023-10-13 06:33:04

by Amir Goldstein

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

On Fri, Oct 13, 2023 at 2:48 AM Stephen Rothwell <[email protected]> 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.