From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Paolo Bonzini" <pbonzini@redhat•com>,
"Radim Krčmář" <rkrcmar@redhat•com>, KVM <kvm@vger•kernel.org>,
"Catalin Marinas" <catalin.marinas@arm•com>,
"Will Deacon" <will.deacon@arm•com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Dave Martin <Dave.Martin@arm•com>,
Marc Zyngier <marc.zyngier@arm•com>
Subject: linux-next: manual merge of the kvm tree with the arm64 tree
Date: Mon, 4 Jun 2018 16:57:54 +1000 [thread overview]
Message-ID: <20180604165754.6ae09612@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1901 bytes --]
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/arm64/include/asm/processor.h
between commit:
94b07c1f8c39 ("arm64: signal: Report signal frame size to userspace via auxv")
from the arm64 tree and commit:
9a6e594869b2 ("arm64/sve: Move sve_pffr() to fpsimd.h and make inline")
from the kvm 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/arm64/include/asm/processor.h
index 65ab83e8926e,c99e657fdd57..000000000000
--- a/arch/arm64/include/asm/processor.h
+++ b/arch/arm64/include/asm/processor.h
@@@ -246,9 -246,17 +248,20 @@@ void cpu_enable_pan(const struct arm64_
void cpu_enable_cache_maint_trap(const struct arm64_cpu_capabilities *__unused);
void cpu_clear_disr(const struct arm64_cpu_capabilities *__unused);
+extern unsigned long __ro_after_init signal_minsigstksz; /* sigframe size */
+extern void __init minsigstksz_setup(void);
+
+ /*
+ * Not at the top of the file due to a direct #include cycle between
+ * <asm/fpsimd.h> and <asm/processor.h>. Deferring this #include
+ * ensures that contents of processor.h are visible to fpsimd.h even if
+ * processor.h is included first.
+ *
+ * These prctl helpers are the only things in this file that require
+ * fpsimd.h. The core code expects them to be in this header.
+ */
+ #include <asm/fpsimd.h>
+
/* Userspace interface for PR_SVE_{SET,GET}_VL prctl()s: */
#define SVE_SET_VL(arg) sve_set_current_vl(arg)
#define SVE_GET_VL() sve_get_current_vl()
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-06-04 6:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-04 6:57 Stephen Rothwell [this message]
2018-06-04 7:33 ` linux-next: manual merge of the kvm tree with the arm64 tree Dave Martin
2018-06-05 17:08 ` Paolo Bonzini
-- strict thread matches above, loose matches on Subject: below --
2024-10-28 6:03 Stephen Rothwell
2024-10-28 17:44 ` Catalin Marinas
2024-10-28 18:06 ` Sean Christopherson
2018-02-07 1:27 Stephen Rothwell
2018-02-07 8:29 ` Christoffer Dall
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=20180604165754.6ae09612@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Dave.Martin@arm$(echo .)com \
--cc=catalin.marinas@arm$(echo .)com \
--cc=kvm@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=marc.zyngier@arm$(echo .)com \
--cc=pbonzini@redhat$(echo .)com \
--cc=rkrcmar@redhat$(echo .)com \
--cc=will.deacon@arm$(echo .)com \
/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