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=-5.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=no 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 977DAC4338F for ; Fri, 20 Aug 2021 09:27:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7290360C3E for ; Fri, 20 Aug 2021 09:27:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236573AbhHTJ2E (ORCPT ); Fri, 20 Aug 2021 05:28:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:36194 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234754AbhHTJ2C (ORCPT ); Fri, 20 Aug 2021 05:28:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 28CAB60C3E; Fri, 20 Aug 2021 09:27:24 +0000 (UTC) Date: Fri, 20 Aug 2021 10:27:21 +0100 From: Catalin Marinas To: Stephen Rothwell Cc: Christoffer Dall , Marc Zyngier , Will Deacon , Anshuman Khandual , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the kvm-arm tree with the arm64 tree Message-ID: <20210820092721.GA23080@arm.com> References: <20210819140544.5acbcf21@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210819140544.5acbcf21@canb.auug.org.au> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Aug 19, 2021 at 02:05:44PM +1000, Stephen Rothwell wrote: > Today's linux-next merge of the kvm-arm tree got a conflict in: > > arch/arm64/include/asm/sysreg.h > > between commit: > > 79d82cbcbb3d ("arm64/kexec: Test page size support with new TGRAN range values") > > from the arm64 tree and commit: > > 504c6295b998 ("arm64/mm: Add remaining ID_AA64MMFR0_PARANGE_ macros") > > from the kvm-arm 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. This looks fine. Thanks Stephen. -- Catalin