* linux-next: duplicate patches in the afs tree
@ 2025-01-20 22:15 Stephen Rothwell
2025-01-23 15:02 ` David Howells
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2025-01-20 22:15 UTC (permalink / raw)
To: David Howells; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: duplicate patches in the afs tree
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
0 siblings, 1 reply; 5+ messages in thread
From: David Howells @ 2025-01-23 15:02 UTC (permalink / raw)
To: Stephen Rothwell
Cc: dhowells, Linux Kernel Mailing List, Linux Next Mailing List
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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: duplicate patches in the afs tree
2025-01-23 15:02 ` David Howells
@ 2025-01-24 3:27 ` Stephen Rothwell
2025-01-24 7:09 ` David Howells
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2025-01-24 3:27 UTC (permalink / raw)
To: David Howells; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-01-27 2:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2025-01-24 7:09 ` David Howells
2025-01-27 2:39 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox