From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792480374; b=h2WLxZb9HUz+pTZejJ9/rEZa+ZnRX5Uo1d3eauH0vkBB1BMSUNaMJXNJK04PpvV1Y8hC d1XmXxbcCHf5S2bPVWr+yjdsVgWxwohpjfEC1DrArvOgs6G423Gh8Amo0PAO/zTmgs/yF jO502ua4zNHYb2aCmi8vuFywmMHuZTn9Ui0M+QauP/K/J5aoAYtm86EtaSnGxSPc3E+ph CFV1co9sZJ3HUFZ+UpvCFBWzdOEkA1Ln9ii3NQTp+6LRpgy4nOX7YgnBx/cX2aNdHi7Y1 17FaAHcMOBdBpt1xQrgvRZx8kLJp8DTR6MP+wituHIk9fMD2fkNWcow5nlirotwT6iw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792480374; h=Received:DKIM-Signature:Received:Date:Message-ID:From:To:Cc:Subject: In-Reply-To:References:User-Agent:MIME-Version:Content-Type: X-SA-Exim-Connect-IP:X-SA-Exim-Rcpt-To:X-SA-Exim-Mail-From: X-SA-Exim-Scanned; bh=ZoV9Wz62aYiL5BWtqMeRBCY7UFLWc6enrWeTYPiqAWI=; b=JOOM7c5jSS7SPAQ5kXMdKs6gOg32CLy4DG/rMhtUQEdbu/TeyLq/UdXvf2A4kXXkXe+m oA52kYDUHAeDcJTDTSJAXlDG4uZ4PiYdBYLVbPD1CqBmjrH8rW+6pdV2MQDMP/510ygnU uEruKcbb/B0tLW7lYI2oOb7QQbtBCn/V5Zz0Lg02ltVhrNL08z1BccG6tffosts97NAlv Epk8obEtjVQHf/FkKQa4YBtg0uhojFHo8IrmWyZ96enJF5hwIcrbtsHLER+yP9VC8weZA haw5YVaoXcvnKF2tGh0aQDImb/XAqNUkXFsuSEbUyns8XkgVXDmZSfhl236BnsviFRQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=ZjoFICcK; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DB4FD606A326; Tue, 20 Oct 2026 07:12:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=ZjoFICcK Received: by smtp.kernel.org (Postfix) with ESMTPSA id 738941F000CA; Tue, 20 Oct 2026 07:12:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1792480373; bh=ZoV9Wz62aYiL5BWtqMeRBCY7UFLWc6enrWeTYPiqAWI=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=ZjoFICcK9yvSV9CMrCCzTtYUOjwDL8HjzyDvaPkSK/DCcZ4cbeES4+CzKhNcHnRTc livyH/PgTvCrp47WoSU6gRTBvtOaMGaWvf/xN74GwwkMXMFD86E3gOyTIqZ5HivEN9 QfIZCCSMFtADQ8/h7ONdm/MOogrQkvXC9xJsQMenZQCvOIRYCTP+apTHaXGbSpoFdt KczPbCtXgOGaq7IMQGGvkjjpaXEgUlXE9UjM712GdfJXDPSwa7MIqD3qNBNaliqraB JV1mFgcJqBqe83vvs2kGAfeQLWjqaBmrA6PTnVjSW7jhBH1lh5EwfiTYb46eAaGlsn PjP190VesmcSg== 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 1xJ41j-0000000508c-1NYD; Tue, 20 Oct 2026 07:12:51 +0000 Date: Tue, 20 Oct 2026 08:12:50 +0100 Message-ID: <86wlrczvyl.wl-maz@kernel.org> From: Marc Zyngier To: Paolo Bonzini Cc: Mark Brown , Oliver Upton , KVM , Linux Kernel Mailing List , Linux Next Mailing List , Suzuki K Poulose Subject: Re: linux-next: manual merge of the kvm-arm tree with the kvm 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) X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: pbonzini@redhat.com, broonie@kernel.org, oupton@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, suzuki.poulose@arm.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, 19 Oct 2026 17:56:39 +0100, Paolo Bonzini wrote: > > Il lun 19 ott 2026, 18:46 Mark Brown ha scritto: > > > > Hi all, > > > > Today's linux-next merge of the kvm-arm tree got a conflict in: > > > > arch/arm64/kvm/mmu.c > > > > between commit: > > > > dd0bc00e3e920 ("Merge branch kvm-arm64/cca-7.4 into kvmarm-master/next") > > > > from the kvm tree and commits: > > > > b44a8c32f0116 ("KVM: arm64: Abstract out memory abort handling") > > 892c8a0bcc8e3 ("Merge branch kvm-arm64/cca-7.4 into kvmarm-master/next") > > > > from the kvm-arm tree. > > Hi Marc/Oliver, is this something that will be fixed on your side by rebasing? Yes. As soon as you have a stable tag on your side, I'll remerge the fix branches on that, and all will be forgiven. Thanks, M. -- Without deviation from the norm, progress is not possible.