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 1917AC4321D for ; Fri, 17 Aug 2018 09:33:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BC78D218EB for ; Fri, 17 Aug 2018 09:33:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BC78D218EB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.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 S1726601AbeHQMga (ORCPT ); Fri, 17 Aug 2018 08:36:30 -0400 Received: from foss.arm.com ([217.140.101.70]:44938 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726319AbeHQMga (ORCPT ); Fri, 17 Aug 2018 08:36:30 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D522D80D; Fri, 17 Aug 2018 02:33:48 -0700 (PDT) Received: from big-swifty.misterjones.org (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D18353F5B3; Fri, 17 Aug 2018 02:33:45 -0700 (PDT) Date: Fri, 17 Aug 2018 10:33:42 +0100 Message-ID: <86d0uhpcax.wl-marc.zyngier@arm.com> From: Marc Zyngier To: Paolo Bonzini Cc: Stephen Rothwell , Christoffer Dall , Catalin Marinas , Will Deacon , Linux-Next Mailing List , Linux Kernel Mailing List , Suzuki K Poulose , Radim =?UTF-8?B?S3LEjW3DocWZ?= , KVM Subject: Re: linux-next: manual merge of the kvm-arm tree with the arm64 tree In-Reply-To: <84803922-9430-43d2-7db6-e9c0dd02da6a@redhat.com> References: <20180723144641.62b2b226@canb.auug.org.au> <20180816101515.24d0b49f@canb.auug.org.au> <84803922-9430-43d2-7db6-e9c0dd02da6a@redhat.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 EasyPG/1.0.0 Emacs/25.1 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) Organization: ARM Ltd MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 17 Aug 2018 09:32:55 +0100, Paolo Bonzini wrote: > > 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 > >> > >> --#define ARM64_NCAPS 32 > >> ++#define ARM64_NCAPS 33 > >> > >> #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. We've dealt with that kind of trivial conflicts in the past without requiring topic branches (cpucaps.h has always been a popular place), and I always assumed that this was acceptable. I must have misunderstood something here. Next time, I'll direct the architecture-specific code via the arm64 tree directly. Thanks, M. -- Jazz is not dead, it just smell funny.