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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0E5AC05027 for ; Mon, 6 Feb 2023 08:37:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229914AbjBFIhm (ORCPT ); Mon, 6 Feb 2023 03:37:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229570AbjBFIhk (ORCPT ); Mon, 6 Feb 2023 03:37:40 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C0EE166EB; Mon, 6 Feb 2023 00:37:39 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C839F60D36; Mon, 6 Feb 2023 08:37:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A5FEC433EF; Mon, 6 Feb 2023 08:37:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675672658; bh=d9r2+zhB4SZhtgXOcoj7sMId6D1ENMDEFBbMiGW6S9g=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=TE1wjo+5tjefBNoz+dypRB2reOeL0GqAHTHmyNcTT8+X8+kr60ihjbqjKszuoCzDU xuzoPOE/o8OXDk7QZDhaAn33wSAEqXlLddXXenqY3cGLj9jxv1OlEjZ9fidY6byEWc NxG8RWSTWTNPKHfEqQNxUq6fzQIo2+bNGUlLq78+ah1woH6O84U/yAEGX11i4jWRfA J98icgShAYUVEGKB0qXD+gsNEHJyNFIe2bZo4UDOHUFlv4dm1XEX6+mLWZ6IAHFm8+ pgHfswX5c507oT1eCjf3e23Jc5dgGud8zD87a+vea+5G2r0HFM/CqiVttn7StthP32 wGX8wrWdwFUvA== 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 1pOx0J-007vyf-NY; Mon, 06 Feb 2023 08:37:35 +0000 Date: Mon, 06 Feb 2023 08:37:35 +0000 Message-ID: <861qn31968.wl-maz@kernel.org> From: Marc Zyngier To: Stephen Rothwell Cc: Christoffer Dall , Catalin Marinas , Will Deacon , Linux Kernel Mailing List , Linux Next Mailing List , Mark Brown , Oliver Upton , Quentin Perret Subject: Re: linux-next: manual merge of the kvm-arm tree with the arm64 tree In-Reply-To: <20230206124451.11532a04@canb.auug.org.au> References: <20230206124451.11532a04@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/28.2 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) 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, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, broonie@kernel.org, oliver.upton@linux.dev, qperret@google.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 06 Feb 2023 01:44:51 +0000, Stephen Rothwell wrote: > > [1 ] > Hi all, > > Today's linux-next merge of the kvm-arm tree got a conflict in: > > arch/arm64/kernel/hyp-stub.S > > between commit: > > f122576f3533 ("arm64/sme: Enable host kernel to access ZT0") > > from the arm64 tree and commit: > > e2d4f5ae1771 ("KVM: arm64: Introduce finalise_el2_state macro") > > from the kvm-arm tree. > > I fixed it up (the code modified by the former was moved by the latter, > so I applied the following merge fix patch) 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. > > I hope I got this right :-) Thanks for giving it a go! Catalin, we'll probably end-up taking the arm64/for-next/tpidr2 branch into the kvmarm tree in order to minimise the damage. Please shout if you want to solve this the other way around (taking the finalise_el2_state refactoring in the arm64 tree). M. -- Without deviation from the norm, progress is not possible.