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 387872AE94; Mon, 6 Jan 2025 09:40:25 +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=1736156426; cv=none; b=EbuR/wDCjcgm+iAXXcjsSb6+XxED8fDXvlBQEASOsJgojSwI0hKZd2U4V/g8Jua3DCr1iJME6YjHsBqhbPDThN/eBY5Jw2FfhiB7NXTBnDDVW2+a866hs4RTMuhYNJj72i0PmFkTq0vdQ0z39MhCHyPD1h8Gw1VMBJoFLExnFiw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736156426; c=relaxed/simple; bh=DD8P6845NVhf2wPBpNQBUFqDTHfZxogjcHQYSh70/kw=; h=Date:Message-ID:From:To:Cc:Subject:In-Reply-To:References: MIME-Version:Content-Type; b=hE3v4+ulcEcXiE6jDulx8oSDSasq65E4Y/FAMoOk2FwpNrb7c0bBK5JZoN2yx+mwt9bitP2O1bOIRR1W+OOa0Bp4rdL2CrAqyQlPrS7wCxzoeKGUMfCvWZBy3yTZdyJXa9SaQU0KbqBp2pwvZN7Fs5iiIUXlpenAIC3j95GCL0U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bGkaZDp3; 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="bGkaZDp3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B8A18C4CEDD; Mon, 6 Jan 2025 09:40:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1736156425; bh=DD8P6845NVhf2wPBpNQBUFqDTHfZxogjcHQYSh70/kw=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=bGkaZDp30xwOHIS0+TIbdFySS1PUcuqofGbGBe27Kxg5NDQgdEd9sn+Tua4c40exD t2bBpVyuIAOftp9v6KXCY4YpodEYlt4flt50vKeZ88MO9ar1S/TKpb0FkO8u4/t2Pw uOH8L75oRxQcIbistEh/tD5aMk84aS9td4lpPP2+ev2xarW+9bRXfMipMjEYKZXV8Q SqCxbxSQJovljzt7jmQsaKFLbfQeYyftdeF+Q5BGB1uaYhEvT4a+mz8J5pWOwRhQSR cLNOo/6emHLPD1XPUQBNtlYmpLSHuADzxRX5fDlVJs86rY6L2vPrU2yfYr3Z4Llszm /iTAi0DnZ5Ghg== 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 1tUjax-009MOg-Bq; Mon, 06 Jan 2025 09:40:23 +0000 Date: Mon, 06 Jan 2025 09:40:22 +0000 Message-ID: <86a5c4p9fd.wl-maz@kernel.org> From: Marc Zyngier To: Will Deacon , Stephen Rothwell Cc: Christoffer Dall , Catalin Marinas , Fuad Tabba , Linux Kernel Mailing List , Linux Next Mailing List , Oliver Upton Subject: Re: linux-next: manual merge of the kvm-arm tree with the arm64 tree In-Reply-To: <20250106145303.47c2bef4@canb.auug.org.au> References: <20250106145303.47c2bef4@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-next@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: will@kernel.org, sfr@canb.auug.org.au, cdall@cs.columbia.edu, catalin.marinas@arm.com, tabba@google.com, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, oliver.upton@linux.dev X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false On Mon, 06 Jan 2025 03:53:03 +0000, Stephen Rothwell wrote: > > [1 ] > Hi all, > > Today's linux-next merge of the kvm-arm tree got conflicts in: > > arch/arm64/include/asm/kvm_emulate.h > arch/arm64/kvm/fpsimd.c > arch/arm64/kvm/hyp/nvhe/pkvm.c > arch/arm64/kvm/hyp/nvhe/switch.c > > between commit: > > e5ecedcd7cc2 ("arm64/sysreg: Get rid of CPACR_ELx SysregFields") > > from the arm64 tree and commits: > > 41d6028e28bd ("KVM: arm64: Convert the SVE guest vcpu flag to a vm flag") > d381e53384a6 ("KVM: arm64: Move host SME/SVE tracking flags to host data") > f50758260bff ("KVM: arm64: Group setting traps for protected VMs by control register") > 2fd5b4b0e7b4 ("KVM: arm64: Calculate cptr_el2 traps on activating traps") > (and maybe others) > > 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. Hi Stephen, This looks OK to me, but we should fix this in the kvmarm tree. Will: I'm going to merge the arm64/for-next/cpufeature branch back into kvmarm/next -- shout if you foresee an issue with that. Thanks, M. -- Without deviation from the norm, progress is not possible.