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 1EB4DC433EF for ; Wed, 4 May 2022 07:06:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233945AbiEDHJp (ORCPT ); Wed, 4 May 2022 03:09:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345307AbiEDHJf (ORCPT ); Wed, 4 May 2022 03:09:35 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B44223153; Wed, 4 May 2022 00:06:00 -0700 (PDT) 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 ams.source.kernel.org (Postfix) with ESMTPS id 07ED7B80DB7; Wed, 4 May 2022 07:05:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B9693C385A5; Wed, 4 May 2022 07:05:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1651647957; bh=PLF8cZci2CLas9CTO5yBNBglie9vUKaC3WIlntvt3Pc=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=mD8c49kfF/nqjr2Ldd5KK0Eb7hoVZTnlH04rqi/ErmVw5pzK1v4ZEfgC4CTFXJiKY Oa757NeHHRz5iyJ3WLLnb/RL2sKk76OxNzBShkfhTgs3U8a8W68JKQrvpdpkJGgRsY Cr3rNCgKsIHrTvuo50jgclfQRyT+Et/0NKZHIaXKnuJrtu8VS/HoJ1oG16wliBLaR+ lhwCrs5DYOggbP7rm0G7Tw7FJH3d99iLbvMIxuLwL3krJdvnAsxMu6QYhKkewMPW+5 7PkgqmUbW83vAel9TeqHYhiu5KgE6srhsSj2akZbkCWi/xWeIswue4zSNH5K56mlYG zzJjFyDPNaLyw== Received: from 82-132-235-80.dab.02.net ([82.132.235.80] helo=wait-a-minute.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nm958-008pH6-VE; Wed, 04 May 2022 08:05:55 +0100 Date: Wed, 04 May 2022 08:06:07 +0100 Message-ID: <877d71ixpc.wl-maz@kernel.org> From: Marc Zyngier To: Stephen Rothwell Cc: Christoffer Dall , Catalin Marinas , Will Deacon , Alexandru Elisei , 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: <20220504143529.4060ab27@canb.auug.org.au> References: <20220504143529.4060ab27@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/27.1 (x86_64-pc-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: 82.132.235.80 X-SA-Exim-Rcpt-To: sfr@canb.auug.org.au, cdall@cs.columbia.edu, catalin.marinas@arm.com, will@kernel.org, alexandru.elisei@arm.com, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, oupton@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 Wed, 04 May 2022 05:35:29 +0100, Stephen Rothwell wrote: > > [1 ] > Hi all, > > Today's linux-next merge of the kvm-arm tree got a conflict in: > > arch/arm64/kvm/sys_regs.c > > between commit: > > 0b12620fddb8 ("KVM: arm64: Treat ESR_EL2 as a 64-bit register") > > from the arm64 tree and commits: > > e65197666773 ("KVM: arm64: Wire up CP15 feature registers to their AArch64 equivalents") > 9369bc5c5e35 ("KVM: arm64: Plumb cp10 ID traps through the AArch64 sysreg handler") > > 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. Thanks Stephen. I've added a fix to address the 'u32 esr' instances that were introduced by Oliver's series. Catalin, do you want me to merge the ESR series in the kvm-arm tree in order to avoid the minor conflict? Cheers, M. -- Without deviation from the norm, progress is not possible.