* linux-next: duplicate patches in the xen-tip tree
@ 2023-02-14 1:47 Stephen Rothwell
2023-02-14 11:22 ` Peter Zijlstra
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2023-02-14 1:47 UTC (permalink / raw
To: Juergen Gross, Konrad Rzeszutek Wilk, Stefano Stabellini,
Boris Ostrovsky, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra
Cc: Xen Devel, Per Bilse, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 604 bytes --]
Hi all,
The following commits are also in the tip tree as different commits
(but the same patches):
415dab3c1796 ("drivers/xen/hypervisor: Expose Xen SIF flags to userspace")
336f560a8917 ("x86/xen: don't let xen_pv_play_dead() return")
f697cb00afa9 ("x86/xen: mark xen_pv_play_dead() as __noreturn")
These are commits
859761e770f8 ("drivers/xen/hypervisor: Expose Xen SIF flags to userspace")
076cbf5d2163 ("x86/xen: don't let xen_pv_play_dead() return")
1aff0d2658e5 ("x86/xen: mark xen_pv_play_dead() as __noreturn")
in the tip tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: duplicate patches in the xen-tip tree
2023-02-14 1:47 linux-next: duplicate patches in the xen-tip tree Stephen Rothwell
@ 2023-02-14 11:22 ` Peter Zijlstra
2023-02-21 8:39 ` Ingo Molnar
0 siblings, 1 reply; 3+ messages in thread
From: Peter Zijlstra @ 2023-02-14 11:22 UTC (permalink / raw
To: Stephen Rothwell
Cc: Juergen Gross, Konrad Rzeszutek Wilk, Stefano Stabellini,
Boris Ostrovsky, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Xen Devel, Per Bilse, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 792 bytes --]
On Tue, Feb 14, 2023 at 12:47:00PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> The following commits are also in the tip tree as different commits
> (but the same patches):
>
> 415dab3c1796 ("drivers/xen/hypervisor: Expose Xen SIF flags to userspace")
> 336f560a8917 ("x86/xen: don't let xen_pv_play_dead() return")
> f697cb00afa9 ("x86/xen: mark xen_pv_play_dead() as __noreturn")
>
> These are commits
>
> 859761e770f8 ("drivers/xen/hypervisor: Expose Xen SIF flags to userspace")
> 076cbf5d2163 ("x86/xen: don't let xen_pv_play_dead() return")
> 1aff0d2658e5 ("x86/xen: mark xen_pv_play_dead() as __noreturn")
>
> in the tip tree.
This was intentional (dependencies) and the plan is to only offer the
tip branch for merge after the Xen tree goes in.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: duplicate patches in the xen-tip tree
2023-02-14 11:22 ` Peter Zijlstra
@ 2023-02-21 8:39 ` Ingo Molnar
0 siblings, 0 replies; 3+ messages in thread
From: Ingo Molnar @ 2023-02-21 8:39 UTC (permalink / raw
To: Peter Zijlstra
Cc: Stephen Rothwell, Juergen Gross, Konrad Rzeszutek Wilk,
Stefano Stabellini, Boris Ostrovsky, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, Xen Devel, Per Bilse, Linux Kernel Mailing List,
Linux Next Mailing List
* Peter Zijlstra <peterz@infradead.org> wrote:
> On Tue, Feb 14, 2023 at 12:47:00PM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > The following commits are also in the tip tree as different commits
> > (but the same patches):
> >
> > 415dab3c1796 ("drivers/xen/hypervisor: Expose Xen SIF flags to userspace")
> > 336f560a8917 ("x86/xen: don't let xen_pv_play_dead() return")
> > f697cb00afa9 ("x86/xen: mark xen_pv_play_dead() as __noreturn")
> >
> > These are commits
> >
> > 859761e770f8 ("drivers/xen/hypervisor: Expose Xen SIF flags to userspace")
> > 076cbf5d2163 ("x86/xen: don't let xen_pv_play_dead() return")
> > 1aff0d2658e5 ("x86/xen: mark xen_pv_play_dead() as __noreturn")
> >
> > in the tip tree.
>
> This was intentional (dependencies) and the plan is to only offer the
> tip branch for merge after the Xen tree goes in.
The rebase & *duplication* was not intentional at all - I assumed
1aff0d2658e5 won't get rebased. :-/
We'll probably have to redo the objtool tree.
Thanks,
Ingo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-02-21 8:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-14 1:47 linux-next: duplicate patches in the xen-tip tree Stephen Rothwell
2023-02-14 11:22 ` Peter Zijlstra
2023-02-21 8:39 ` Ingo Molnar
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 read-only IMAP folder(s) and NNTP newsgroup(s).