From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751912AbeFDG57 (ORCPT ); Mon, 4 Jun 2018 02:57:59 -0400 Received: from ozlabs.org ([203.11.71.1]:34471 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751210AbeFDG55 (ORCPT ); Mon, 4 Jun 2018 02:57:57 -0400 Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Date: Mon, 4 Jun 2018 16:57:54 +1000 From: Stephen Rothwell To: Paolo Bonzini , Radim =?UTF-8?B?S3LEjW3DocWZ?= , KVM , Catalin Marinas , Will Deacon Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Dave Martin , Marc Zyngier Subject: linux-next: manual merge of the kvm tree with the arm64 tree Message-ID: <20180604165754.6ae09612@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/n14b8pRqBLK8xIB1HUr7aGp"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/n14b8pRqBLK8xIB1HUr7aGp Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable 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 a= uxv") 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. --=20 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 *__u= nused); void cpu_clear_disr(const struct arm64_cpu_capabilities *__unused); =20 +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 + * and . 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 +=20 /* 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() --Sig_/n14b8pRqBLK8xIB1HUr7aGp Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlsU4vIACgkQAVBC80lX 0Gx1Hgf+Ph8fFxTVvh9AKFpeQTS673VhL4JB27NP6xUd8p8rBup+hxuF7yZaW8vg sqUJIADyG/mDNpXwRxiBXR/60pIW918u9fnJMkUl+NO3uUgfVZHoILr0UzEsJZ+G yAd4fDdyTSWx2R3XbREN6IJmx6uWtfipPbIJBWptAohqdNnTtmVqR49UCtCkw3nz N+KRw8IDCeOGKPRS7UrGqbQJPMd+MRzchuNmeaacAbmA8pY5klXIOC7rPcEpSy22 TetTxARN5PAuChDTnVeAualNbChd30f5aPzXjbjxcXEgmeYCn/gm1rS1N6ZkmDIO fnkpSBIDNxzRaV3CUERRfFpGeSBH5g== =8UjV -----END PGP SIGNATURE----- --Sig_/n14b8pRqBLK8xIB1HUr7aGp--