On Tue, 2021-03-09 at 21:48 +0000, David Howells wrote: > Ilya Dryomov <idryomov@xxxxxxxxx> wrote: > > > Could you please create a named branch that doesn't include AFS bits > > (e.g. netfs-next)? It is going to be needed once we get closer to > > a merge window and netfs helper library is finalized. I won't be able > > to pull a seemingly random SHA (of the commit preceding the first AFS > > commit) into ceph-client/master. > > I will do. Currently I'm slightly stalled waiting on Willy. He wants me to > make some changes and I'm hoping he'll tell me what they should be at some > point. > I agree with Ilya that we shouldn't be keeping AFS changes in the ceph tree. Until you and Willy sort it out, would it be possible to instead keep up two branches? 1/ a netfs lib one (probably at 5ed6545841ed in your tree as of today) 2/ and one based on top of 1 that has the AFS patches (currently the fscache-netfs-lib branch). I can just rebase our tree onto 5ed6545841ed for now, but going forward it'd be better if we were based on a branch or tag in your tree. Thanks, -- Jeff Layton <jlayton@xxxxxxxxxx>
