public inbox for linux-next@vger.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Howells <dhowells@redhat.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: duplicate patches in the afs tree
Date: Fri, 24 Jan 2025 14:27:22 +1100	[thread overview]
Message-ID: <20250124142722.7b8a4681@canb.auug.org.au> (raw)
In-Reply-To: <2190350.1737644541@warthog.procyon.org.uk>

[-- Attachment #1: Type: text/plain, Size: 944 bytes --]

Hi David,

On Thu, 23 Jan 2025 15:02:21 +0000 David Howells <dhowells@redhat.com> wrote:
>
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > The following commits are also in Linus Torvalds' tree as different
> > commits (but the same patches):
> > 
> >   3c9ca856fd12 ("afs: Make /afs/@cell and /afs/.@cell symlinks")
> >   bcc4d777ff8d ("afs: Add rootcell checks")
> >   31ad47d22fac ("afs: Make /afs/.<cell> as well as /afs/<cell> mountpoints")  
> 
> Did you drop my afs-next branch from linux-next in favour of Christian's tree?

No, I didn't.  Do you want me to remove your tree from linux-next?  If
not, then just reset your afs-next branch to somewhere in Linus' tree,
or to the equivalent to the top of your branch in Christian's tree -
30bca65bbbae ("afs: Make /afs/@cell and /afs/.@cell symlinks") - which
has now been merged into Linus' tree).  (And then push it out :-))

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

  reply	other threads:[~2025-01-24  3:27 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-20 22:15 linux-next: duplicate patches in the afs tree Stephen Rothwell
2025-01-23 15:02 ` David Howells
2025-01-24  3:27   ` Stephen Rothwell [this message]
2025-01-24  7:09     ` David Howells
2025-01-27  2:39       ` Stephen Rothwell

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=20250124142722.7b8a4681@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=dhowells@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox