From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Juergen Gross <jgross@suse•com>,
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>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: linux-next: manual merge of the xen-tip tree with the tip tree
Date: Thu, 31 Aug 2017 14:37:54 +1000 [thread overview]
Message-ID: <20170831143754.3136a6c6@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the xen-tip tree got a conflict in:
arch/x86/xen/enlighten_pv.c
between commit:
64b163fab684 ("x86/idt: Unify gate_struct handling for 32/64-bit kernels")
from the tip tree and commit:
ad5b8c4ba323 ("xen: get rid of paravirt op adjust_exception_frame")
from the xen-tip tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/x86/xen/enlighten_pv.c
index c76f5ff4d0d7,148527c4e48a..000000000000
--- a/arch/x86/xen/enlighten_pv.c
+++ b/arch/x86/xen/enlighten_pv.c
@@@ -596,42 -651,10 +658,10 @@@ static int cvt_gate_to_trap(int vector
info->vector = vector;
- addr = gate_offset(*val);
+ addr = gate_offset(val);
#ifdef CONFIG_X86_64
- /*
- * Look for known traps using IST, and substitute them
- * appropriately. The debugger ones are the only ones we care
- * about. Xen will handle faults like double_fault,
- * so we should never see them. Warn if
- * there's an unexpected IST-using fault handler.
- */
- if (addr == (unsigned long)debug)
- addr = (unsigned long)xen_debug;
- else if (addr == (unsigned long)int3)
- addr = (unsigned long)xen_int3;
- else if (addr == (unsigned long)stack_segment)
- addr = (unsigned long)xen_stack_segment;
- else if (addr == (unsigned long)double_fault) {
- /* Don't need to handle these */
- if (!get_trap_addr(&addr, val->ist))
++ if (!get_trap_addr(&addr, val->bits.ist))
return 0;
- #ifdef CONFIG_X86_MCE
- } else if (addr == (unsigned long)machine_check) {
- /*
- * when xen hypervisor inject vMCE to guest,
- * use native mce handler to handle it
- */
- ;
- #endif
- } else if (addr == (unsigned long)nmi)
- /*
- * Use the native version as well.
- */
- ;
- else {
- /* Some other trap using IST? */
- if (WARN_ON(val->bits.ist != 0))
- return 0;
- }
#endif /* CONFIG_X86_64 */
info->address = addr;
next reply other threads:[~2017-08-31 4:37 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-31 4:37 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-10-28 6:16 linux-next: manual merge of the xen-tip tree with the tip tree 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
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 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=20170831143754.3136a6c6@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Xen-devel@lists$(echo .)xensource.com \
--cc=boris.ostrovsky@oracle$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=jgross@suse$(echo .)com \
--cc=konrad.wilk@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=sstabellini@kernel$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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