* A fs-next branch
@ 2024-05-14 22:57 Matthew Wilcox
2024-05-20 3:23 ` Stephen Rothwell
0 siblings, 1 reply; 12+ messages in thread
From: Matthew Wilcox @ 2024-05-14 22:57 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-fsdevel
Hi Stephen,
At LSFMM we're talking about the need to do more integrated testing with
the various fs trees, the fs infrastructure and the vfs. We'd like to
avoid that testing be blocked by a bad patch in, say, a graphics driver.
A solution we're kicking around would be for linux-next to include a
'fs-next' branch which contains the trees which have opted into this
new branch. Would this be tremendously disruptive to your workflow or
would this be an easy addition?
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: A fs-next branch
2024-05-14 22:57 A fs-next branch Matthew Wilcox
@ 2024-05-20 3:23 ` Stephen Rothwell
2024-05-20 4:58 ` Theodore Ts'o
2024-05-20 21:38 ` Matthew Wilcox
0 siblings, 2 replies; 12+ messages in thread
From: Stephen Rothwell @ 2024-05-20 3:23 UTC (permalink / raw)
To: Matthew Wilcox; +Cc: linux-fsdevel
[-- Attachment #1: Type: text/plain, Size: 804 bytes --]
Hi Willy,
Sorry for the slow response.
On Tue, 14 May 2024 23:57:36 +0100 Matthew Wilcox <willy@infradead.org> wrote:
>
> At LSFMM we're talking about the need to do more integrated testing with
> the various fs trees, the fs infrastructure and the vfs. We'd like to
> avoid that testing be blocked by a bad patch in, say, a graphics driver.
>
> A solution we're kicking around would be for linux-next to include a
> 'fs-next' branch which contains the trees which have opted into this
> new branch. Would this be tremendously disruptive to your workflow or
> would this be an easy addition?
How would this be different from what happens at the moment with all
the separate file system trees and the various "vfs" trees? I can
include any tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: A fs-next branch
2024-05-20 3:23 ` Stephen Rothwell
@ 2024-05-20 4:58 ` Theodore Ts'o
2024-05-20 21:38 ` Matthew Wilcox
1 sibling, 0 replies; 12+ messages in thread
From: Theodore Ts'o @ 2024-05-20 4:58 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Matthew Wilcox, linux-fsdevel
On Mon, May 20, 2024 at 01:23:26PM +1000, Stephen Rothwell wrote:
> On Tue, 14 May 2024 23:57:36 +0100 Matthew Wilcox <willy@infradead.org> wrote:
> >
> > At LSFMM we're talking about the need to do more integrated testing with
> > the various fs trees, the fs infrastructure and the vfs. We'd like to
> > avoid that testing be blocked by a bad patch in, say, a graphics driver.
> >
> > A solution we're kicking around would be for linux-next to include a
> > 'fs-next' branch which contains the trees which have opted into this
> > new branch. Would this be tremendously disruptive to your workflow or
> > would this be an easy addition?
>
> How would this be different from what happens at the moment with all
> the separate file system trees and the various "vfs" trees? I can
> include any tree.
What we were hoping for was that you would merge together the vfs,
iomap, and various fs-specific trees (e.g., bcachefs, btrfs, ext4,
f2fs, xfs, etc.) together, and then publish it as "fs-next".
You could then use fs-next as something that would be merged into
linux-next instead of the component fs trees, so hopefully it wouldn't
be a significant amount of extra work for you.
As Willy stated, the advantages of having an official daily "fs-next"
tree is that multiple file system developers would be able to test the
same branch and compare notes when regressions are found. And the
advantage of fs-next versus the full linux-next is that it reduces the
chances of tests getting blocked by non-fs-relevant changes.
Cheers,
- Ted
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: A fs-next branch
2024-05-20 3:23 ` Stephen Rothwell
2024-05-20 4:58 ` Theodore Ts'o
@ 2024-05-20 21:38 ` Matthew Wilcox
2024-05-27 23:16 ` Stephen Rothwell
1 sibling, 1 reply; 12+ messages in thread
From: Matthew Wilcox @ 2024-05-20 21:38 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-fsdevel
On Mon, May 20, 2024 at 01:23:26PM +1000, Stephen Rothwell wrote:
> Hi Willy,
>
> Sorry for the slow response.
No problem; I figure you get one week off every ten weeks or so ...
> On Tue, 14 May 2024 23:57:36 +0100 Matthew Wilcox <willy@infradead.org> wrote:
> >
> > At LSFMM we're talking about the need to do more integrated testing with
> > the various fs trees, the fs infrastructure and the vfs. We'd like to
> > avoid that testing be blocked by a bad patch in, say, a graphics driver.
> >
> > A solution we're kicking around would be for linux-next to include a
> > 'fs-next' branch which contains the trees which have opted into this
> > new branch. Would this be tremendously disruptive to your workflow or
> > would this be an easy addition?
>
> How would this be different from what happens at the moment with all
> the separate file system trees and the various "vfs" trees? I can
> include any tree.
As I understand the structure of linux-next right now, you merge one
tree after another in some order which isn't relevant to me, so I have no
idea what it is. What we're asking for is that we end up with a branch
in your tree called fs-next that is:
- Linus's tree as of that day
- plus the vfs trees
- plus xfs, btrfs, ext4, nfs, cifs, ...
but not, eg, graphics, i2c, tip, networking, etc
How we get that branch is really up to you; if you want to start by
merging all the filesystem trees, tag that, then continue merging all the
other trees, that would work. If you want to merge all the filesystem
trees to fs-next, then merge the fs-next tree at some point in your list
of trees, that would work too.
Also, I don't think we care if it's a branch or a tag. Just something
we can call fs-next to all test against and submit patches against.
The important thing is that we get your resolution of any conflicts.
There was debate about whether we wanted to include mm-stable in this
tree, and I think that debate will continue, but I don't think it'll be
a big difference to you whether we ask you to include it or not?
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: A fs-next branch
2024-05-20 21:38 ` Matthew Wilcox
@ 2024-05-27 23:16 ` Stephen Rothwell
2024-05-29 4:35 ` Stephen Rothwell
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2024-05-27 23:16 UTC (permalink / raw)
To: Matthew Wilcox; +Cc: linux-fsdevel
[-- Attachment #1: Type: text/plain, Size: 1581 bytes --]
Hi Matthew,
On Mon, 20 May 2024 22:38:16 +0100 Matthew Wilcox <willy@infradead.org> wrote:
>
> As I understand the structure of linux-next right now, you merge one
> tree after another in some order which isn't relevant to me, so I have no
> idea what it is. What we're asking for is that we end up with a branch
> in your tree called fs-next that is:
>
> - Linus's tree as of that day
> - plus the vfs trees
> - plus xfs, btrfs, ext4, nfs, cifs, ...
>
> but not, eg, graphics, i2c, tip, networking, etc
>
> How we get that branch is really up to you; if you want to start by
> merging all the filesystem trees, tag that, then continue merging all the
> other trees, that would work. If you want to merge all the filesystem
> trees to fs-next, then merge the fs-next tree at some point in your list
> of trees, that would work too.
>
> Also, I don't think we care if it's a branch or a tag. Just something
> we can call fs-next to all test against and submit patches against.
> The important thing is that we get your resolution of any conflicts.
>
> There was debate about whether we wanted to include mm-stable in this
> tree, and I think that debate will continue, but I don't think it'll be
> a big difference to you whether we ask you to include it or not?
OK, I can see how to do that. I will start on it tomorrow. The plan
is that you will end up with a branch (fs-next) in the linux-next tree
that will be a merge of the above trees each day and I will merge it
into the -next tree as well.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: A fs-next branch
2024-05-27 23:16 ` Stephen Rothwell
@ 2024-05-29 4:35 ` Stephen Rothwell
2024-05-29 11:12 ` Christian Brauner
2024-06-10 13:15 ` Andreas Gruenbacher
0 siblings, 2 replies; 12+ messages in thread
From: Stephen Rothwell @ 2024-05-29 4:35 UTC (permalink / raw)
To: Matthew Wilcox; +Cc: linux-fsdevel
[-- Attachment #1: Type: text/plain, Size: 7571 bytes --]
Hi all,
On Tue, 28 May 2024 09:16:29 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Mon, 20 May 2024 22:38:16 +0100 Matthew Wilcox <willy@infradead.org> wrote:
> >
> > As I understand the structure of linux-next right now, you merge one
> > tree after another in some order which isn't relevant to me, so I have no
> > idea what it is. What we're asking for is that we end up with a branch
> > in your tree called fs-next that is:
> >
> > - Linus's tree as of that day
> > - plus the vfs trees
> > - plus xfs, btrfs, ext4, nfs, cifs, ...
> >
> > but not, eg, graphics, i2c, tip, networking, etc
> >
> > How we get that branch is really up to you; if you want to start by
> > merging all the filesystem trees, tag that, then continue merging all the
> > other trees, that would work. If you want to merge all the filesystem
> > trees to fs-next, then merge the fs-next tree at some point in your list
> > of trees, that would work too.
> >
> > Also, I don't think we care if it's a branch or a tag. Just something
> > we can call fs-next to all test against and submit patches against.
> > The important thing is that we get your resolution of any conflicts.
> >
> > There was debate about whether we wanted to include mm-stable in this
> > tree, and I think that debate will continue, but I don't think it'll be
> > a big difference to you whether we ask you to include it or not?
>
> OK, I can see how to do that. I will start on it tomorrow. The plan
> is that you will end up with a branch (fs-next) in the linux-next tree
> that will be a merge of the above trees each day and I will merge it
> into the -next tree as well.
OK, this is what I have done today:
I have created 2 new branches local to linux-next - fs-current and fs-next.
fs-current is based on Linus' tree of the day and contains the
following trees (name, contacts, URL, branch):
fscrypt-current Eric Biggers <ebiggers@kernel.org>, Theodore Ts'o <tytso@mit.edu>, Jaegeuk Kim <jaegeuk@kernel.org> git://git.kernel.org/pub/scm/fs/fscrypt/linux.git for-current
fsverity-current Eric Biggers <ebiggers@kernel.org>, Theodore Ts'o <tytso@mit.edu> git://git.kernel.org/pub/scm/fs/fsverity/linux.git for-current
btrfs-fixes David Sterba <dsterba@suse.cz> git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git next-fixes
vfs-fixes Al Viro <viro@ZenIV.linux.org.uk> git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git fixes
erofs-fixes Gao Xiang <xiang@kernel.org> git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git fixes
nfsd-fixes Chuck Lever <chuck.lever@oracle.com> git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes
v9fs-fixes Eric Van Hensbergen <ericvh@gmail.com> git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git fixes/next
overlayfs-fixes Miklos Szeredi <miklos@szeredi.hu>, Amir Goldstein <amir73il@gmail.com> git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git ovl-fixes
The fs-next tree is based on fs-current and contains these trees:
bcachefs Kent Overstreet <kent.overstreet@linux.dev> https://evilpiepirate.org/git/bcachefs.git for-next
pidfd Christian Brauner <brauner@kernel.org> git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git for-next
fscrypt Eric Biggers <ebiggers@kernel.org>, Theodore Ts'o <tytso@mit.edu>, Jaegeuk Kim <jaegeuk@kernel.org> git://git.kernel.org/pub/scm/fs/fscrypt/linux.git for-next
afs David Howells <dhowells@redhat.com> git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs-next
btrfs David Sterba <dsterba@suse.cz> git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-next
ceph Jeff Layton <jlayton@kernel.org>, Ilya Dryomov <idryomov@gmail.com> git://github.com/ceph/ceph-client.git master
cifs Steve French <smfrench@gmail.com>, CIFS <linux-cifs@vger.kernel.org> git://git.samba.org/sfrench/cifs-2.6.git for-next
configfs Christoph Hellwig <hch@lst.de> git://git.infradead.org/users/hch/configfs.git for-next
erofs Gao Xiang <xiang@kernel.org> git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git dev
exfat Namjae Jeon <linkinjeon@kernel.org> git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git dev
exportfs Chuck Lever <chuck.lever@oracle.com> git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux exportfs-next
ext3 Jan Kara <jack@suse.cz> git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git for_next
ext4 Theodore Ts'o <tytso@mit.edu> git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git dev
f2fs Jaegeuk Kim <jaegeuk@kernel.org> git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git dev
fsverity Eric Biggers <ebiggers@kernel.org>, Theodore Y. Ts'o <tytso@mit.edu> git://git.kernel.org/pub/scm/fs/fsverity/linux.git for-next
fuse Miklos Szeredi <miklos@szeredi.hu> git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git for-next
gfs2 Steven Whitehouse <swhiteho@redhat.com>, Bob Peterson <rpeterso@redhat.com> git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git for-next
jfs Dave Kleikamp <dave.kleikamp@oracle.com> git://github.com/kleikamp/linux-shaggy.git jfs-next
ksmbd Steve French <smfrench@gmail.com> https://github.com/smfrench/smb3-kernel.git ksmbd-for-next
nfs Trond Myklebust <trondmy@gmail.com> git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git linux-next
nfs-anna Anna Schumaker <anna@kernel.org>, Trond Myklebust <trondmy@gmail.com>, NFS Mailing List <linux-nfs@vger.kernel.org> git://git.linux-nfs.org/projects/anna/linux-nfs.git linux-next
nfsd Chuck Lever <chuck.lever@oracle.com> git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-next
ntfs3 Konstantin Komarov <almaz.alexandrovich@paragon-software.com> https://github.com/Paragon-Software-Group/linux-ntfs3.git master
orangefs Mike Marshall <hubcap@omnibond.com> git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux for-next
overlayfs Miklos Szeredi <miklos@szeredi.hu>, Amir Goldstein <amir73il@gmail.com> git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-next
ubifs Richard Weinberger <richard@nod.at> git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git next
v9fs Dominique Martinet <asmadeus@codewreck.org> git://github.com/martinetd/linux 9p-next
v9fs-ericvh Eric Van Hensbergen <ericvh@gmail.com> git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git ericvh/for-next
xfs Darrick J. Wong <djwong@kernel.org>, David Chinner <david@fromorbit.com>, <linux-xfs@vger.kernel.org> git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git for-next
zonefs Damien Le Moal <Damien.LeMoal@wdc.com> git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git for-next
iomap Darrick J. Wong <djwong@kernel.org> git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap-for-next
djw-vfs Darrick J. Wong <djwong@kernel.org> git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git vfs-for-next
file-locks Jeff Layton <jlayton@kernel.org> git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git locks-next
iversion Jeff Layton <jlayton@kernel.org> git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git iversion-next
vfs-brauner Christian Brauner <brauner@kernel.org> git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs.all
vfs Al Viro <viro@ZenIV.linux.org.uk> git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-next
Please let me know if you want them reordered or some removed/added.
Both these branches will be exported with the linux-next tree each day.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: A fs-next branch
2024-05-29 4:35 ` Stephen Rothwell
@ 2024-05-29 11:12 ` Christian Brauner
2024-05-30 23:50 ` Stephen Rothwell
2024-06-10 13:15 ` Andreas Gruenbacher
1 sibling, 1 reply; 12+ messages in thread
From: Christian Brauner @ 2024-05-29 11:12 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Matthew Wilcox, linux-fsdevel
On Wed, May 29, 2024 at 02:35:58PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> On Tue, 28 May 2024 09:16:29 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Mon, 20 May 2024 22:38:16 +0100 Matthew Wilcox <willy@infradead.org> wrote:
> > >
> > > As I understand the structure of linux-next right now, you merge one
> > > tree after another in some order which isn't relevant to me, so I have no
> > > idea what it is. What we're asking for is that we end up with a branch
> > > in your tree called fs-next that is:
> > >
> > > - Linus's tree as of that day
> > > - plus the vfs trees
> > > - plus xfs, btrfs, ext4, nfs, cifs, ...
> > >
> > > but not, eg, graphics, i2c, tip, networking, etc
> > >
> > > How we get that branch is really up to you; if you want to start by
> > > merging all the filesystem trees, tag that, then continue merging all the
> > > other trees, that would work. If you want to merge all the filesystem
> > > trees to fs-next, then merge the fs-next tree at some point in your list
> > > of trees, that would work too.
> > >
> > > Also, I don't think we care if it's a branch or a tag. Just something
> > > we can call fs-next to all test against and submit patches against.
> > > The important thing is that we get your resolution of any conflicts.
> > >
> > > There was debate about whether we wanted to include mm-stable in this
> > > tree, and I think that debate will continue, but I don't think it'll be
> > > a big difference to you whether we ask you to include it or not?
> >
> > OK, I can see how to do that. I will start on it tomorrow. The plan
> > is that you will end up with a branch (fs-next) in the linux-next tree
> > that will be a merge of the above trees each day and I will merge it
> > into the -next tree as well.
>
> OK, this is what I have done today:
>
> I have created 2 new branches local to linux-next - fs-current and fs-next.
>
> fs-current is based on Linus' tree of the day and contains the
> following trees (name, contacts, URL, branch):
>
> fscrypt-current Eric Biggers <ebiggers@kernel.org>, Theodore Ts'o <tytso@mit.edu>, Jaegeuk Kim <jaegeuk@kernel.org> git://git.kernel.org/pub/scm/fs/fscrypt/linux.git for-current
> fsverity-current Eric Biggers <ebiggers@kernel.org>, Theodore Ts'o <tytso@mit.edu> git://git.kernel.org/pub/scm/fs/fsverity/linux.git for-current
> btrfs-fixes David Sterba <dsterba@suse.cz> git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git next-fixes
> vfs-fixes Al Viro <viro@ZenIV.linux.org.uk> git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git fixes
> erofs-fixes Gao Xiang <xiang@kernel.org> git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git fixes
> nfsd-fixes Chuck Lever <chuck.lever@oracle.com> git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes
> v9fs-fixes Eric Van Hensbergen <ericvh@gmail.com> git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git fixes/next
> overlayfs-fixes Miklos Szeredi <miklos@szeredi.hu>, Amir Goldstein <amir73il@gmail.com> git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git ovl-fixes
Could you please add
git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs.fixes to fs-current
as well. Thanks!
>
>
> The fs-next tree is based on fs-current and contains these trees:
>
> bcachefs Kent Overstreet <kent.overstreet@linux.dev> https://evilpiepirate.org/git/bcachefs.git for-next
> pidfd Christian Brauner <brauner@kernel.org> git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git for-next
> fscrypt Eric Biggers <ebiggers@kernel.org>, Theodore Ts'o <tytso@mit.edu>, Jaegeuk Kim <jaegeuk@kernel.org> git://git.kernel.org/pub/scm/fs/fscrypt/linux.git for-next
> afs David Howells <dhowells@redhat.com> git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs-next
> btrfs David Sterba <dsterba@suse.cz> git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-next
> ceph Jeff Layton <jlayton@kernel.org>, Ilya Dryomov <idryomov@gmail.com> git://github.com/ceph/ceph-client.git master
> cifs Steve French <smfrench@gmail.com>, CIFS <linux-cifs@vger.kernel.org> git://git.samba.org/sfrench/cifs-2.6.git for-next
> configfs Christoph Hellwig <hch@lst.de> git://git.infradead.org/users/hch/configfs.git for-next
> erofs Gao Xiang <xiang@kernel.org> git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git dev
> exfat Namjae Jeon <linkinjeon@kernel.org> git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git dev
> exportfs Chuck Lever <chuck.lever@oracle.com> git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux exportfs-next
> ext3 Jan Kara <jack@suse.cz> git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git for_next
> ext4 Theodore Ts'o <tytso@mit.edu> git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git dev
> f2fs Jaegeuk Kim <jaegeuk@kernel.org> git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git dev
> fsverity Eric Biggers <ebiggers@kernel.org>, Theodore Y. Ts'o <tytso@mit.edu> git://git.kernel.org/pub/scm/fs/fsverity/linux.git for-next
> fuse Miklos Szeredi <miklos@szeredi.hu> git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git for-next
> gfs2 Steven Whitehouse <swhiteho@redhat.com>, Bob Peterson <rpeterso@redhat.com> git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git for-next
> jfs Dave Kleikamp <dave.kleikamp@oracle.com> git://github.com/kleikamp/linux-shaggy.git jfs-next
> ksmbd Steve French <smfrench@gmail.com> https://github.com/smfrench/smb3-kernel.git ksmbd-for-next
> nfs Trond Myklebust <trondmy@gmail.com> git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git linux-next
> nfs-anna Anna Schumaker <anna@kernel.org>, Trond Myklebust <trondmy@gmail.com>, NFS Mailing List <linux-nfs@vger.kernel.org> git://git.linux-nfs.org/projects/anna/linux-nfs.git linux-next
> nfsd Chuck Lever <chuck.lever@oracle.com> git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-next
> ntfs3 Konstantin Komarov <almaz.alexandrovich@paragon-software.com> https://github.com/Paragon-Software-Group/linux-ntfs3.git master
> orangefs Mike Marshall <hubcap@omnibond.com> git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux for-next
> overlayfs Miklos Szeredi <miklos@szeredi.hu>, Amir Goldstein <amir73il@gmail.com> git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-next
> ubifs Richard Weinberger <richard@nod.at> git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git next
> v9fs Dominique Martinet <asmadeus@codewreck.org> git://github.com/martinetd/linux 9p-next
> v9fs-ericvh Eric Van Hensbergen <ericvh@gmail.com> git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git ericvh/for-next
> xfs Darrick J. Wong <djwong@kernel.org>, David Chinner <david@fromorbit.com>, <linux-xfs@vger.kernel.org> git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git for-next
> zonefs Damien Le Moal <Damien.LeMoal@wdc.com> git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git for-next
> iomap Darrick J. Wong <djwong@kernel.org> git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap-for-next
> djw-vfs Darrick J. Wong <djwong@kernel.org> git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git vfs-for-next
> file-locks Jeff Layton <jlayton@kernel.org> git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git locks-next
> iversion Jeff Layton <jlayton@kernel.org> git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git iversion-next
> vfs-brauner Christian Brauner <brauner@kernel.org> git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs.all
> vfs Al Viro <viro@ZenIV.linux.org.uk> git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-next
>
>
> Please let me know if you want them reordered or some removed/added.
>
> Both these branches will be exported with the linux-next tree each day.
>
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: A fs-next branch
2024-05-29 11:12 ` Christian Brauner
@ 2024-05-30 23:50 ` Stephen Rothwell
0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2024-05-30 23:50 UTC (permalink / raw)
To: Christian Brauner; +Cc: Matthew Wilcox, linux-fsdevel
[-- Attachment #1: Type: text/plain, Size: 1178 bytes --]
Hi Christian,
On Wed, 29 May 2024 13:12:15 +0200 Christian Brauner <brauner@kernel.org> wrote:
>
> Could you please add
> git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs.fixes to fs-current
> as well. Thanks!
Done from today. Called vfs-brauner-fixes.
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgement of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
You will need to ensure that the patches/commits in your tree/series have
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
sfr@canb.auug.org.au
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: A fs-next branch
2024-05-29 4:35 ` Stephen Rothwell
2024-05-29 11:12 ` Christian Brauner
@ 2024-06-10 13:15 ` Andreas Gruenbacher
2024-06-10 22:16 ` Stephen Rothwell
1 sibling, 1 reply; 12+ messages in thread
From: Andreas Gruenbacher @ 2024-06-10 13:15 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Christian Brauner, Matthew Wilcox, linux-fsdevel
Stephen,
On Wed, 29 May 2024 14:35:58 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> On Tue, 28 May 2024 09:16:29 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Mon, 20 May 2024 22:38:16 +0100 Matthew Wilcox <willy@infradead.org> wrote:
> > >
> > > As I understand the structure of linux-next right now, you merge one
> > > tree after another in some order which isn't relevant to me, so I have no
> > > idea what it is. What we're asking for is that we end up with a branch
> > > in your tree called fs-next that is:
> > >
> > > - Linus's tree as of that day
> > > - plus the vfs trees
> > > - plus xfs, btrfs, ext4, nfs, cifs, ...
> > >
> > > but not, eg, graphics, i2c, tip, networking, etc
> > >
> > > How we get that branch is really up to you; if you want to start by
> > > merging all the filesystem trees, tag that, then continue merging all the
> > > other trees, that would work. If you want to merge all the filesystem
> > > trees to fs-next, then merge the fs-next tree at some point in your list
> > > of trees, that would work too.
> > >
> > > Also, I don't think we care if it's a branch or a tag. Just something
> > > we can call fs-next to all test against and submit patches against.
> > > The important thing is that we get your resolution of any conflicts.
> > >
> > > There was debate about whether we wanted to include mm-stable in this
> > > tree, and I think that debate will continue, but I don't think it'll be
> > > a big difference to you whether we ask you to include it or not?
> >
> > OK, I can see how to do that. I will start on it tomorrow. The plan
> > is that you will end up with a branch (fs-next) in the linux-next tree
> > that will be a merge of the above trees each day and I will merge it
> > into the -next tree as well.
>
> OK, this is what I have done today:
>
> I have created 2 new branches local to linux-next - fs-current and fs-next.
>
> fs-current is based on Linus' tree of the day and contains the
> following trees (name, contacts, URL, branch):
>
> fscrypt-current Eric Biggers <ebiggers@kernel.org>, Theodore Ts'o <tytso@mit.edu>, Jaegeuk Kim <jaegeuk@kernel.org> git://git.kernel.org/pub/scm/fs/fscrypt/linux.git for-current
> fsverity-current Eric Biggers <ebiggers@kernel.org>, Theodore Ts'o <tytso@mit.edu> git://git.kernel.org/pub/scm/fs/fsverity/linux.git for-current
> btrfs-fixes David Sterba <dsterba@suse.cz> git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git next-fixes
> vfs-fixes Al Viro <viro@ZenIV.linux.org.uk> git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git fixes
> erofs-fixes Gao Xiang <xiang@kernel.org> git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git fixes
> nfsd-fixes Chuck Lever <chuck.lever@oracle.com> git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes
> v9fs-fixes Eric Van Hensbergen <ericvh@gmail.com> git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git fixes/next
> overlayfs-fixes Miklos Szeredi <miklos@szeredi.hu>, Amir Goldstein <amir73il@gmail.com> git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git ovl-fixes
>
>
> The fs-next tree is based on fs-current and contains these trees:
>
> bcachefs Kent Overstreet <kent.overstreet@linux.dev> https://evilpiepirate.org/git/bcachefs.git for-next
> pidfd Christian Brauner <brauner@kernel.org> git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git for-next
> fscrypt Eric Biggers <ebiggers@kernel.org>, Theodore Ts'o <tytso@mit.edu>, Jaegeuk Kim <jaegeuk@kernel.org> git://git.kernel.org/pub/scm/fs/fscrypt/linux.git for-next
> afs David Howells <dhowells@redhat.com> git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs-next
> btrfs David Sterba <dsterba@suse.cz> git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-next
> ceph Jeff Layton <jlayton@kernel.org>, Ilya Dryomov <idryomov@gmail.com> git://github.com/ceph/ceph-client.git master
> cifs Steve French <smfrench@gmail.com>, CIFS <linux-cifs@vger.kernel.org> git://git.samba.org/sfrench/cifs-2.6.git for-next
> configfs Christoph Hellwig <hch@lst.de> git://git.infradead.org/users/hch/configfs.git for-next
> erofs Gao Xiang <xiang@kernel.org> git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git dev
> exfat Namjae Jeon <linkinjeon@kernel.org> git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git dev
> exportfs Chuck Lever <chuck.lever@oracle.com> git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux exportfs-next
> ext3 Jan Kara <jack@suse.cz> git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git for_next
> ext4 Theodore Ts'o <tytso@mit.edu> git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git dev
> f2fs Jaegeuk Kim <jaegeuk@kernel.org> git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git dev
> fsverity Eric Biggers <ebiggers@kernel.org>, Theodore Y. Ts'o <tytso@mit.edu> git://git.kernel.org/pub/scm/fs/fsverity/linux.git for-next
> fuse Miklos Szeredi <miklos@szeredi.hu> git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git for-next
> gfs2 Steven Whitehouse <swhiteho@redhat.com>, Bob Peterson <rpeterso@redhat.com> git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git for-next
> jfs Dave Kleikamp <dave.kleikamp@oracle.com> git://github.com/kleikamp/linux-shaggy.git jfs-next
> ksmbd Steve French <smfrench@gmail.com> https://github.com/smfrench/smb3-kernel.git ksmbd-for-next
> nfs Trond Myklebust <trondmy@gmail.com> git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git linux-next
> nfs-anna Anna Schumaker <anna@kernel.org>, Trond Myklebust <trondmy@gmail.com>, NFS Mailing List <linux-nfs@vger.kernel.org> git://git.linux-nfs.org/projects/anna/linux-nfs.git linux-next
> nfsd Chuck Lever <chuck.lever@oracle.com> git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-next
> ntfs3 Konstantin Komarov <almaz.alexandrovich@paragon-software.com> https://github.com/Paragon-Software-Group/linux-ntfs3.git master
> orangefs Mike Marshall <hubcap@omnibond.com> git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux for-next
> overlayfs Miklos Szeredi <miklos@szeredi.hu>, Amir Goldstein <amir73il@gmail.com> git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-next
> ubifs Richard Weinberger <richard@nod.at> git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git next
> v9fs Dominique Martinet <asmadeus@codewreck.org> git://github.com/martinetd/linux 9p-next
> v9fs-ericvh Eric Van Hensbergen <ericvh@gmail.com> git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git ericvh/for-next
> xfs Darrick J. Wong <djwong@kernel.org>, David Chinner <david@fromorbit.com>, <linux-xfs@vger.kernel.org> git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git for-next
> zonefs Damien Le Moal <Damien.LeMoal@wdc.com> git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git for-next
> iomap Darrick J. Wong <djwong@kernel.org> git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap-for-next
> djw-vfs Darrick J. Wong <djwong@kernel.org> git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git vfs-for-next
> file-locks Jeff Layton <jlayton@kernel.org> git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git locks-next
> iversion Jeff Layton <jlayton@kernel.org> git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git iversion-next
> vfs-brauner Christian Brauner <brauner@kernel.org> git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs.all
> vfs Al Viro <viro@ZenIV.linux.org.uk> git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-next
>
> Please let me know if you want them reordered or some removed/added.
>
> Both these branches will be exported with the linux-next tree each day.
I don't know if it's relevant, but gfs2 is closely related to dlm, and dlm
isn't included here. Would it make sense to either move dlm into fs-next, or
move gfs2 out of it, to where dlm is merged?
Thanks,
Andreas
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: A fs-next branch
2024-06-10 13:15 ` Andreas Gruenbacher
@ 2024-06-10 22:16 ` Stephen Rothwell
2024-06-11 3:53 ` Matthew Wilcox
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2024-06-10 22:16 UTC (permalink / raw)
To: Andreas Gruenbacher
Cc: Christian Brauner, Matthew Wilcox, linux-fsdevel, David Teigland
[-- Attachment #1: Type: text/plain, Size: 430 bytes --]
Hi Andreas,
On Mon, 10 Jun 2024 15:15:38 +0200 Andreas Gruenbacher <agruenba@redhat.com> wrote:
>
> I don't know if it's relevant, but gfs2 is closely related to dlm, and dlm
> isn't included here. Would it make sense to either move dlm into fs-next, or
> move gfs2 out of it, to where dlm is merged?
I don't know the answer to those questions, sorry. Hopefully someone
can advise us.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: A fs-next branch
2024-06-10 22:16 ` Stephen Rothwell
@ 2024-06-11 3:53 ` Matthew Wilcox
2024-06-11 22:51 ` Stephen Rothwell
0 siblings, 1 reply; 12+ messages in thread
From: Matthew Wilcox @ 2024-06-11 3:53 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andreas Gruenbacher, Christian Brauner, linux-fsdevel,
David Teigland
On Tue, Jun 11, 2024 at 08:16:57AM +1000, Stephen Rothwell wrote:
> Hi Andreas,
>
> On Mon, 10 Jun 2024 15:15:38 +0200 Andreas Gruenbacher <agruenba@redhat.com> wrote:
> >
> > I don't know if it's relevant, but gfs2 is closely related to dlm, and dlm
> > isn't included here. Would it make sense to either move dlm into fs-next, or
> > move gfs2 out of it, to where dlm is merged?
>
> I don't know the answer to those questions, sorry. Hopefully someone
> can advise us.
I would add the DLM tree to fs-next since it's a normal dependency of gfs2.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: A fs-next branch
2024-06-11 3:53 ` Matthew Wilcox
@ 2024-06-11 22:51 ` Stephen Rothwell
0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2024-06-11 22:51 UTC (permalink / raw)
To: Matthew Wilcox
Cc: Andreas Gruenbacher, Christian Brauner, linux-fsdevel,
David Teigland
[-- Attachment #1: Type: text/plain, Size: 739 bytes --]
Hi all,
On Tue, 11 Jun 2024 04:53:10 +0100 Matthew Wilcox <willy@infradead.org> wrote:
>
> On Tue, Jun 11, 2024 at 08:16:57AM +1000, Stephen Rothwell wrote:
> >
> > On Mon, 10 Jun 2024 15:15:38 +0200 Andreas Gruenbacher <agruenba@redhat.com> wrote:
> > >
> > > I don't know if it's relevant, but gfs2 is closely related to dlm, and dlm
> > > isn't included here. Would it make sense to either move dlm into fs-next, or
> > > move gfs2 out of it, to where dlm is merged?
> >
> > I don't know the answer to those questions, sorry. Hopefully someone
> > can advise us.
>
> I would add the DLM tree to fs-next since it's a normal dependency of gfs2.
I have done that from today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2024-06-11 22:51 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-14 22:57 A fs-next branch Matthew Wilcox
2024-05-20 3:23 ` Stephen Rothwell
2024-05-20 4:58 ` Theodore Ts'o
2024-05-20 21:38 ` Matthew Wilcox
2024-05-27 23:16 ` Stephen Rothwell
2024-05-29 4:35 ` Stephen Rothwell
2024-05-29 11:12 ` Christian Brauner
2024-05-30 23:50 ` Stephen Rothwell
2024-06-10 13:15 ` Andreas Gruenbacher
2024-06-10 22:16 ` Stephen Rothwell
2024-06-11 3:53 ` Matthew Wilcox
2024-06-11 22:51 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).