From: Ingo Molnar <mingo@kernel.org>
To: Juergen Gross <jgross@suse.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Stefano Stabellini <sstabellini@kernel.org>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Xen Devel <Xen-devel@lists.xensource.com>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Andy Lutomirski <luto@kernel.org>,
Mathias Krause <minipli@googlemail.com>,
Thomas Garnier <thgarnie@google.com>
Subject: Re: linux-next: manual merge of the xen-tip tree with the tip tree
Date: Wed, 29 Mar 2017 10:59:45 +0200 [thread overview]
Message-ID: <20170329085945.GA11382@gmail.com> (raw)
In-Reply-To: <906e3014-881c-b1c7-4943-e0ed9845aab2@suse.com>
* Juergen Gross <jgross@suse.com> wrote:
> On 29/03/17 05:35, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the xen-tip tree got a conflict in:
> >
> > arch/x86/xen/enlighten.c
> >
> > between commits:
> >
> > 6415813bae75 ("x86/cpu: Drop wp_works_ok member of struct cpuinfo_x86")
> > 69218e47994d ("x86: Remap GDT tables in the fixmap section")
> > b23adb7d3f7d ("x86/xen/gdt: Use X86_FEATURE_XENPV instead of globals for the GDT fixup")
> >
> > from the tip tree and commits:
> >
> > 75cd32d6093e ("x86/xen: split off enlighten_pv.c")
> >
> > from the xen-tip tree.
> >
> > I dropped the xen-tip tree for today (see other conflict reports),
> > please get together and sort these out, thanks.
> >
>
> Hmm, seems to be a rather bad timing for the series of Vitaly.
>
> What is the best way to resolve those conflicts? A rebase of Vitaly's
> patches seems to be required in any case.
>
> Should I rebase the Xen tree on current tip? This seems to be rather
> easy, but I think this will work only if I can be sure the current tip
> tree contents will all be merged by Linus before the Xen tree.
That's certainly very likely, -tip trees all go in very early in the merge window.
> I could try to cherry pick the patches from tip where Vitaly's patches
> have conflicts with, but I think this could lead to a lot of patches
> to take.
Nor is it desirable as a workflow.
I'd suggest the following: in about a week I can guarantee a working tip:x86/mm
base with most of the 5-level paging patches applied that you could base Xen
patches on.
Unfortunately, right now there's at least one regression with those changes that
needs to be properly fixed before it's a suitable base tree. The fix already
exists, it just needs to be tested and the whole tree needs to cook for a few days
to be dependable for Xen as a base.
> Or we could delay Vitaly's series until tip has been merged, but this
> will either delay some other Xen patches depending on (or conflicting
> with) Vitaly's patches or would make the rebase for Vitaly more
> difficult.
So my suggestion would be: could you delay 75cd32d6093e for a week, and then merge
it on top of a pulled in tip:x86/mm? I'll send that tree to Linus on the first day
of the merge window so there shouldn't be any ordering problems.
Thanks,
Ingo
next prev parent reply other threads:[~2017-03-29 8:59 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-29 3:35 linux-next: manual merge of the xen-tip tree with the tip tree Stephen Rothwell
2017-03-29 8:37 ` Juergen Gross
2017-03-29 8:59 ` Ingo Molnar [this message]
2017-03-29 9:28 ` Juergen Gross
2017-03-29 10:06 ` Vitaly Kuznetsov
2017-04-03 18:03 ` Juergen Gross
2017-04-04 16:04 ` Vitaly Kuznetsov
2017-04-04 16:09 ` Juergen Gross
2017-04-05 6:25 ` Juergen Gross
2017-04-03 14:38 ` Ingo Molnar
2017-04-03 14:55 ` Juergen Gross
2017-03-29 9:54 ` Juergen Gross
2017-03-29 10:41 ` Ingo Molnar
2017-03-29 11:13 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2021-10-28 6:16 Stephen Rothwell
2017-08-31 4:37 Stephen Rothwell
2017-08-31 4:26 Stephen Rothwell
2017-08-31 8:10 ` Thomas Gleixner
2017-08-31 9:00 ` Thomas Gleixner
2017-08-31 9:16 ` Ingo Molnar
2017-08-31 12:36 ` Joe Perches
2017-08-31 10:11 ` Juergen Gross
2017-08-31 12:00 ` Thomas Gleixner
2017-08-31 14:01 ` Boris Ostrovsky
2017-08-31 14:03 ` Juergen Gross
2017-08-31 18:30 ` Thomas Gleixner
2017-08-28 5:20 Stephen Rothwell
2017-08-17 4:03 Stephen Rothwell
2017-06-28 4:21 Stephen Rothwell
2017-04-12 4:30 Stephen Rothwell
2017-04-26 4:57 ` Stephen Rothwell
2017-04-12 4:20 Stephen Rothwell
2017-03-29 3:36 Stephen Rothwell
2017-03-29 3:37 ` Stephen Rothwell
2016-10-03 1:29 Stephen Rothwell
2016-07-26 4:02 Stephen Rothwell
2016-07-26 4:01 Stephen Rothwell
2016-07-26 13:58 ` Boris Ostrovsky
2016-07-18 6:17 Stephen Rothwell
2016-05-02 4:51 Stephen Rothwell
2016-04-29 4:20 Stephen Rothwell
2015-08-12 5:09 Stephen Rothwell
2015-08-12 13:27 ` Boris Ostrovsky
2015-08-12 17:21 ` Peter Zijlstra
2015-08-12 17:38 ` Peter Zijlstra
2015-08-12 17:46 ` Peter Zijlstra
2015-08-12 18:17 ` Boris Ostrovsky
2015-08-12 18:26 ` Andy Lutomirski
2015-08-12 18:30 ` Boris Ostrovsky
2015-08-12 18:26 ` H. Peter Anvin
2015-08-12 18:36 ` Peter Zijlstra
2015-08-12 18:44 ` Boris Ostrovsky
2015-08-12 19:04 ` Peter Zijlstra
2015-08-13 6:45 ` Ingo Molnar
2014-03-20 4:15 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=20170329085945.GA11382@gmail.com \
--to=mingo@kernel.org \
--cc=Xen-devel@lists.xensource.com \
--cc=boris.ostrovsky@oracle.com \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@elte.hu \
--cc=minipli@googlemail.com \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=sstabellini@kernel.org \
--cc=tglx@linutronix.de \
--cc=thgarnie@google.com \
--cc=vkuznets@redhat.com \
/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;
as well as URLs for NNTP newsgroup(s).