From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 354B4C4321D for ; Fri, 17 Aug 2018 08:33:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CF16321893 for ; Fri, 17 Aug 2018 08:33:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CF16321893 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726782AbeHQLfd (ORCPT ); Fri, 17 Aug 2018 07:35:33 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:35450 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726349AbeHQLfd (ORCPT ); Fri, 17 Aug 2018 07:35:33 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AE72340216F1; Fri, 17 Aug 2018 08:33:01 +0000 (UTC) Received: from [10.36.112.15] (unknown [10.36.112.15]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0AE7C2026D6C; Fri, 17 Aug 2018 08:32:57 +0000 (UTC) Subject: Re: linux-next: manual merge of the kvm-arm tree with the arm64 tree To: Stephen Rothwell , Christoffer Dall , Marc Zyngier Cc: Catalin Marinas , Will Deacon , Linux-Next Mailing List , Linux Kernel Mailing List , Suzuki K Poulose , =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= , KVM References: <20180723144641.62b2b226@canb.auug.org.au> <20180816101515.24d0b49f@canb.auug.org.au> From: Paolo Bonzini Openpgp: preference=signencrypt Autocrypt: addr=pbonzini@redhat.com; prefer-encrypt=mutual; keydata= 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 Message-ID: <84803922-9430-43d2-7db6-e9c0dd02da6a@redhat.com> Date: Fri, 17 Aug 2018 10:32:55 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20180816101515.24d0b49f@canb.auug.org.au> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="va2T1wBdwSrHwBAFRTvzJAFCnG1iHKtTA" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Fri, 17 Aug 2018 08:33:01 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Fri, 17 Aug 2018 08:33:01 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'pbonzini@redhat.com' RCPT:'' Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --va2T1wBdwSrHwBAFRTvzJAFCnG1iHKtTA Content-Type: multipart/mixed; boundary="KOIs3meSzZMIIu5yUSGuMz8FTgbRswz2o"; protected-headers="v1" From: Paolo Bonzini To: Stephen Rothwell , Christoffer Dall , Marc Zyngier Cc: Catalin Marinas , Will Deacon , Linux-Next Mailing List , Linux Kernel Mailing List , Suzuki K Poulose , =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= , KVM Message-ID: <84803922-9430-43d2-7db6-e9c0dd02da6a@redhat.com> Subject: Re: linux-next: manual merge of the kvm-arm tree with the arm64 tree References: <20180723144641.62b2b226@canb.auug.org.au> <20180816101515.24d0b49f@canb.auug.org.au> In-Reply-To: <20180816101515.24d0b49f@canb.auug.org.au> --KOIs3meSzZMIIu5yUSGuMz8FTgbRswz2o Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 16/08/2018 02:15, Stephen Rothwell wrote: >> -#define ARM64_HAS_STAGE2_FWB 31 >> +#define ARM64_MISMATCHED_CACHE_TYPE 31 >> ++#define ARM64_HAS_STAGE2_FWB 32 >> =20 >> --#define ARM64_NCAPS 32 >> ++#define ARM64_NCAPS 33 >> =20 >> #endif /* __ASM_CPUCAPS_H */ > This is now a conflict between Linus' tree and the kvm-arm tree (and > presumably soon the kvm tree). This should have been sorted out using topic branches. I'll handle it myself by splitting the pull request in two, but please try to organize better the changes in non-KVM-specific arch/arm and arch/arm64 files. Thanks, Paolo --KOIs3meSzZMIIu5yUSGuMz8FTgbRswz2o-- --va2T1wBdwSrHwBAFRTvzJAFCnG1iHKtTA Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAlt2iDgACgkQv/vSX3jH roNupQgAgcVLFG86iqscCth8pKx1/84CtidFnLAGyAmjkm2CUVE1TFrgwp8zEWv0 C5QeF3L80L2f8FuPk8SLxhfCXhXVqI8ji4mya7T0kiu6bJnz9s7S3L01of9knSdl KgWNB7cTQaZVCK9gQbM/KnNwCcNwwpdSmEB4x7GVLyDCPWhu7BnPo7+KyDRDg9fw CJA3go5liyKm6N1+vPjFPLAhlc24St9y+XYBjs43pFR1zeJYeK2Hqz1eShOk1sBL 0EpRgOg7SduZwwE8RWLi0kXdIGXeBWHmsGGyV3P0x8IwZdfRW/NgXQGK25ABNlf/ cC7uJ3UUrlEIAbXo43UoIn64IMB/6w== =Z//r -----END PGP SIGNATURE----- --va2T1wBdwSrHwBAFRTvzJAFCnG1iHKtTA--