ceph-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Layton <jlayton@kernel.org>
To: David Howells <dhowells@redhat.com>, Ilya Dryomov <idryomov@gmail.com>
Cc: Ceph Development <ceph-devel@vger.kernel.org>
Subject: Re: ceph-client/testing branch rebased
Date: Fri, 12 Mar 2021 11:05:17 -0500	[thread overview]
Message-ID: <99166b01f66d8fa45dd596e9d5bc0a7175bf6a4b.camel@kernel.org> (raw)
In-Reply-To: <201976.1615326505@warthog.procyon.org.uk>

On Tue, 2021-03-09 at 21:48 +0000, David Howells wrote:
> Ilya Dryomov <idryomov@gmail.com> 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@kernel.org>


      reply	other threads:[~2021-03-12 16:06 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-09 19:36 Jeff Layton
2021-03-09 21:30 ` Ilya Dryomov
2021-03-09 21:48 ` David Howells
2021-03-12 16:05   ` Jeff Layton [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=99166b01f66d8fa45dd596e9d5bc0a7175bf6a4b.camel@kernel.org \
    --to=jlayton@kernel.org \
    --cc=ceph-devel@vger.kernel.org \
    --cc=dhowells@redhat.com \
    --cc=idryomov@gmail.com \
    --subject='Re: ceph-client/testing branch rebased' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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