From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EE43D193093; Thu, 5 Sep 2024 08:15:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725524122; cv=none; b=B/sS2r8vJKsjeA48NhGrcpIy+v3X9iGWZUCOKSfWuNJAweJ8GDtr0PAykhwELY4hYFZPB4A3vjJAUnYRtwZ+RmxsN1svUaYVFtyWcDnRCDYxeW2jXvGUc08qX2uhgvtjYk2qQ1+q0bnDCzyLSXJsY2mPOII6R8H1ZrG+7hFmO0o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725524122; c=relaxed/simple; bh=B9SgTLFQCzD/YjL//QQ6wmerqzGa3dydOcmfQmYFl2s=; h=Date:Message-ID:From:To:Cc:Subject:In-Reply-To:References: MIME-Version:Content-Type; b=TWZ0vimo4bfa6oey/7QWIXP/N+9GkGKlUWTQEmSNgUyjzx3sVL704w3a6UpSK6tVJ2aGCUlnkWpxm8uWXol10dfBkb/9ix0DATNoODtiPZ8m8usCPBrKkC72ff6JAuxc8Wl/Q6Q4P2J/NXVx0IXqrjr5Vh+9eYUtPB1zwR6EmPc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=e9F2LppP; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="e9F2LppP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B7D9C4CEC3; Thu, 5 Sep 2024 08:15:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725524121; bh=B9SgTLFQCzD/YjL//QQ6wmerqzGa3dydOcmfQmYFl2s=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=e9F2LppPnPdncLz2j4rUdN9okulzJBIlKRVc/+kfoeLaujwCQ4SYoOZvH4FsZuQ6n DG+0169PqCI86N91sQLBruW98pytVVbRFD+5pEbJe35IJxdKdrU9hczSSsPQcEsqOk RsmosQ6rcsefwtiQHr0YWM4l9ZL2bqOgd57rJ64uhssDol32iBobcglgjyCq01tWrG xdLJyBbgWq0w3j2g0xZfluXO/3SOejQY2KCZAGtzjpeya5k9ragUVbuY+nP5rSs6IN LsQSmMTcXiSvESrOU0tTdUmZDcV0AXzdsc6BfYiBsoIHWA1oHxlCpOvwt9PZ2p1O6S 03qtfOBh4E4ew== Received: from sofa.misterjones.org ([185.219.108.64] helo=goblin-girl.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1sm7eB-009rkP-BK; Thu, 05 Sep 2024 09:15:19 +0100 Date: Thu, 05 Sep 2024 09:15:18 +0100 Message-ID: <86le06v7mx.wl-maz@kernel.org> From: Marc Zyngier To: Stephen Rothwell Cc: Christoffer Dall , Catalin Marinas , Will Deacon , Joey Gouly , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the kvm-arm tree with the arm64 tree In-Reply-To: <20240905160856.14e95d14@canb.auug.org.au> References: <20240905160856.14e95d14@canb.auug.org.au> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/29.4 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: sfr@canb.auug.org.au, cdall@cs.columbia.edu, catalin.marinas@arm.com, will@kernel.org, joey.gouly@arm.com, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false On Thu, 05 Sep 2024 07:08:56 +0100, Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the kvm-arm tree got a conflict in: > > arch/arm64/include/asm/kvm_host.h > > between commit: > > b86c9bea6349 ("KVM: arm64: Save/restore POE registers") > > from the arm64 tree and commits: > > b55688943597 ("KVM: arm64: Move SVCR into the sysreg array") > 7d9c1ed6f4bf ("KVM: arm64: Move FPMR into the sysreg array") > > 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. > > -- > Cheers, > Stephen Rothwell > > diff --cc arch/arm64/include/asm/kvm_host.h > index d5857452a1ec,b9ca899041db..000000000000 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@@ -446,8 -446,10 +446,12 @@@ enum vcpu_sysreg > GCR_EL1, /* Tag Control Register */ > TFSRE0_EL1, /* Tag Fault Status Register (EL0) */ > > + POR_EL0, /* Permission Overlay Register 0 (EL0) */ > + > + /* FP/SIMD/SVE */ > + SVCR, > + FPMR, > + > /* 32bit specific registers. */ > DACR32_EL2, /* Domain Access Control Register */ > IFSR32_EL2, /* Instruction Fault Status Register */ All good, thanks Stephen. M. -- Without deviation from the norm, progress is not possible.