linux-next: duplicate patches in the afs tree

linux-next: duplicate patches in the afs tree

[Stephen Rothwell]

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

Hi all,

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

These are commits

  30bca65bbbae ("afs: Make /afs/@cell and /afs/.@cell symlinks")
  3e914febd79a ("afs: Add rootcell checks")
  92f08e9d3cf0 ("afs: Make /afs/.<cell> as well as /afs/<cell> mountpoints")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: duplicate patches in the afs tree

[David Howells]

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?

David

Re: linux-next: duplicate patches in the afs tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: duplicate patches in the afs tree

[David Howells]

Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Do you want me to remove your tree from linux-next?

Yes, please.

Thanks,
David

Re: linux-next: duplicate patches in the afs tree

[Stephen Rothwell]

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

Hi David,

On Fri, 24 Jan 2025 07:09:47 +0000 David Howells <dhowells@redhat.com> wrote:
>
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Do you want me to remove your tree from linux-next?  
> 
> Yes, please.

Sorry for the misunderstanding.  Removed from tomorrow.  Just ask if
you want it included separately again.

-- 
Cheers,
Stephen Rothwell

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