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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AA705C25B6B for ; Tue, 24 Oct 2023 16:43:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=gVOcpjt/130TzDmZa7Qdtfb+tNr0NpjD/HFo6Rz2v7k=; b=XLsuYpCLg7Iafv O9bhMfmvQqSnkvIBcm6stk7iUupd71uNenTMPMjTjtW4jX7NI8vPafb9iH37UoshMrvL+GUlLMDt7 cRZMnSHzhFb1kuWm3HojtqZBc/lywtYtB/SV9A0FBB+Jpwqo1FJ8mO0Q3ZEzWmOT0K358jYx98hxZ DA5+ko0cnLhcI5n37yPlMeqwYQs75D4yic2JGRoRgIaQT8YnhEO6tAaice4c6P2RemPBoIF5G5A71 n7sWextJO2l4GaesX4rrISe9kChg49Zv75/eANxEDah/en5p5+h9Oppitm6qR51XKAhq9ZM0yXvJQ ScpD77pCQtGPWhBKVTNQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qvKUe-00AXKY-2l; Tue, 24 Oct 2023 16:43:00 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qvKUc-00AXK0-00 for linux-arm-kernel@lists.infradead.org; Tue, 24 Oct 2023 16:42:59 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 2789F62C08; Tue, 24 Oct 2023 16:42:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E0D6BC433C7; Tue, 24 Oct 2023 16:42:54 +0000 (UTC) Date: Tue, 24 Oct 2023 17:42:52 +0100 From: Catalin Marinas To: Oliver Upton Cc: Marc Zyngier , linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Will Deacon , Ard Biesheuvel , Mark Rutland , Ryan Roberts , Anshuman Khandual , Kees Cook , Joey Gouly Subject: Re: [PATCH v4 00/61] arm64: Add support for LPA2 at stage1 and WXN Message-ID: References: <20230912141549.278777-63-ardb@google.com> <169808242073.1650996.15905284839099941158.b4-ty@arm.com> <86msw941bh.wl-maz@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231024_094258_082504_EF4D5C27 X-CRM114-Status: GOOD ( 18.42 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Oliver, On Tue, Oct 24, 2023 at 06:54:24AM +0000, Oliver Upton wrote: > On Mon, Oct 23, 2023 at 09:44:41PM +0100, Catalin Marinas wrote: > > > > So Marc, Oliver, if you want to avoid this, you could merge the > > > > lpa2-stage1 branch into the KVM tree once I freeze it. > > > > > > Yeah, that's probably best (though this looks pretty minor). I'll let > > > Oliver decide on it, as he's in charge this time around. > > > > For some reason git manages to resolve it now without any problem. Not > > sure what happened when I tried this last week. Let's see if Stephen > > reports any conflicts. > > I accidentally dropped Marc's vtcr patch, which accounts for some of the > conflicts. Looks like Stephen did hit a conflict after all, I may as > well pull the branch once it is stable. The arm64 for-next/lpa2-stage1 branch is stable now. I may add stuff on top but wouldn't be rebased. I pushed a fix and some minor cleanups on top since yesterday together with your (and Marc's) Ack for the kvm bits. If you see any conflicts, feel free to merge it into the kvm-arm tree. Thanks. -- Catalin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel