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 26B8633F8C4; Mon, 26 Jan 2026 15:39:41 +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=1769441982; cv=none; b=LIPeLdOmzCXHKCO6cKsaturfhQE5G+10h9zHsxjLFlPT/JBxQVqtaCRpFh7rBWoeNknpZc8OR2fE4zxKZI2cCzmorq+4eidiZQZcrk/YNAzc9oRa5IQJtvIFJAyxq/G/a5ESYqHSI/r6/oPWoYyE8TsDakmML0P7voVCZQH+wmw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769441982; c=relaxed/simple; bh=IV6yQq0SmCS9QcWaKJHNEPIHiNlA6PvJc531TCCub/o=; h=Date:Message-ID:From:To:Cc:Subject:In-Reply-To:References: MIME-Version:Content-Type; b=KnBY6bN2zCm+gSxsph0Jv0K0ueZ0/xxtzjWmZUXkrYwyF0pWxpfvo0OVhYfj8VAnylYup6dd8hAYpE7em2bIqXSC3lTqjLskrA2B7YETBfNi7SdMbxy9NkVmjIQ5Tfg/vbmLxj1D9PHytlTdY4GGVco3LUJFOSHJg22Ja+pWbYs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QobNhNcc; 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="QobNhNcc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A4D80C116C6; Mon, 26 Jan 2026 15:39:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769441981; bh=IV6yQq0SmCS9QcWaKJHNEPIHiNlA6PvJc531TCCub/o=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=QobNhNccdCZPfDZ5jlM35Cx/xz9R5icq+PQQkOFDaDBe8fA6DQuPkcsLRwpcRUPIu FmP50IqtO3oeotm6I+oWTxtFbZfs8ibyvSlJG64utEE1z/8ixXzQDTTDn2nwKXtGP6 xk4ycT7fXdxVVG6137C9LmMWBkV5t6jh1qp8vncDEKn99K5ToKVPRKTvtjVYZeswsC 9UhY+0HNhRLNDXIzbxpHicaYxVpWjzrZR9IprAoY6RN5H4K9Dg3trf26VM0CgbklMO v2qXxIro6tdgHs4O7SLnC3G4RilQ6HK4vlzsn0GOH7FcwIPfcE7l6Wbrlty3WLSmqJ y4tnnnvpHADVw== 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.98.2) (envelope-from ) id 1vkOgl-00000005lKP-206L; Mon, 26 Jan 2026 15:39:39 +0000 Date: Mon, 26 Jan 2026 15:39:39 +0000 Message-ID: <86ikcobcxw.wl-maz@kernel.org> From: Marc Zyngier To: Mark Brown Cc: Catalin Marinas , Will Deacon , Linux Kernel Mailing List , Linux Next Mailing List , Oliver Upton , Paolo Bonzini Subject: Re: linux-next: manual merge of the arm64 tree with the origin tree In-Reply-To: References: 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/30.1 (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: broonie@kernel.org, catalin.marinas@arm.com, will@kernel.org, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, oupton@kernel.org, pbonzini@redhat.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false On Mon, 26 Jan 2026 15:11:27 +0000, Mark Brown wrote: > > [1 ] > Hi all, > > Today's linux-next merge of the arm64 tree got a conflict in: > > arch/arm64/kvm/hyp/entry.S > > between commit: > > 86364832ba6f2 ("KVM: arm64: Don't blindly set set PSTATE.PAN on guest exit") > > from the origin tree and commit: > > 018a231b0260e ("arm64: Unconditionally enable PAN support") > > from the arm64 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. > > [Took the version from Linus' tree.] I can't see the latest next yet, but this doesn't sound right. The correct resolution for this is in the kvmarm/next branch, effectively reverting most of 86364832ba6f2 ("KVM: arm64: Don't blindly set set PSTATE.PAN on guest exit"). Keeping the version from Linus' tree doesn't work, as kvm_pan_patch_el2_entry() references CONFIG_ARM64_PAN, which is removed by 018a231b0260e ("arm64: Unconditionally enable PAN support"). So the arm64 version should be the correct one. Thanks, M. -- Without deviation from the norm, progress is not possible.