From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
To: Thomas Gleixner <tglx@linutronix.de>, 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>,
Xen Devel <Xen-devel@lists.xensource.com>,
Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the xen-tip tree with the tip tree
Date: Thu, 31 Aug 2017 10:01:23 -0400 [thread overview]
Message-ID: <1e7c28e3-d0f6-ac40-fb72-7b95d17379f5@oracle.com> (raw)
In-Reply-To: <alpine.DEB.2.20.1708311359510.1874@nanos>
On 08/31/2017 08:00 AM, Thomas Gleixner wrote:
> On Thu, 31 Aug 2017, Juergen Gross wrote:
>>> I've applied it on top of tip:x86/apic and fixed up the merge conflicts
>>> mindlessly. Patch below.
>>>
>>> Juergen, can you please check the result?
>> You missed the updates to arch/x86/xen/xen-asm_64.S and the declarations
>> of the xen specific trap entries in arch/x86/include/asm/traps.h
> I'll try that again later today, unless you beat me to it.
>
https://marc.info/?l=linux-kernel&m=150296063131595&w=2 should also be
picked up by the tip tree then since it applies on top of the
adjust_exception_frame patch. I will revert it from Xen tree as well.
-boris
next prev parent reply other threads:[~2017-08-31 14:01 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-31 4:26 linux-next: manual merge of the xen-tip tree with the tip tree 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 [this message]
2017-08-31 14:03 ` Juergen Gross
2017-08-31 18:30 ` Thomas Gleixner
-- 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-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
2017-03-29 3:35 Stephen Rothwell
2017-03-29 8:37 ` Juergen Gross
2017-03-29 8:59 ` Ingo Molnar
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
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=1e7c28e3-d0f6-ac40-fb72-7b95d17379f5@oracle.com \
--to=boris.ostrovsky@oracle.com \
--cc=Xen-devel@lists.xensource.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=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=sstabellini@kernel.org \
--cc=tglx@linutronix.de \
/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).