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•xenproject.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
"Peter Zijlstra (Intel)" <peterz@infradead•org>
Subject: linux-next: manual merge of the xen-tip tree with Linus' tree
Date: Tue, 2 Nov 2021 14:25:31 +1100 [thread overview]
Message-ID: <20211102142531.600cd8c9@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 799 bytes --]
Hi all,
Today's linux-next merge of the xen-tip tree got a conflict in:
arch/x86/include/asm/xen/hypercall.h
between commits:
f4afb713e5c3 ("x86/xen: Make get_debugreg() noinstr")
7361fac0465b ("x86/xen: Make set_debugreg() noinstr")
from Linus' tree and commit:
321d124f13fd ("xen: allow pv-only hypercalls only with CONFIG_XEN_PV")
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-11-02 3:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-02 3:25 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-02-16 1:04 linux-next: manual merge of the xen-tip tree with Linus' tree Stephen Rothwell
2018-02-16 1:55 ` Stefano Stabellini
2015-10-07 2:12 Stephen Rothwell
2015-08-14 3:56 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=20211102142531.600cd8c9@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=boris.ostrovsky@oracle$(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=peterz@infradead$(echo .)org \
--cc=sstabellini@kernel$(echo .)org \
--cc=xen-devel@lists$(echo .)xenproject.org \
/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