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 670A9C07545 for ; Tue, 24 Oct 2023 06:55:12 +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=9R3KBPlcejnfKK5aKH6NsrfrwfPBqE5c9ZQsgY3Hg0U=; b=crn05TzVlCTL70 DWhe50uSrHMs2Xy/Q6yQuEzP8i1OTMQEYdmv//3p5oCKSLonRnCQkE5dD/fMjqq+RFRXulxQW3HDX rhdBNAqYVeQpIY4554g9DBplygvw2YAbC37L2LWYJqaoEgZXl6gcaWBkx3foSY+4j3vWvaK8CbyAc hNnXySPyyxgvMen8ZPhrCYfGTXtV0lcu+NMIbar7AXKJQC78/eqVSZz00YdUu12DX5TdYkp2mcmxD cPNmM4la0M5n0lA+s3xIqMDpLU6JQzYKS4PypOtRoU7v/KSJ1H6pznK/tbqsYNYYHeh6Xy45j8/tY VwHnbBQCQWwNKgJXojyA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qvBJF-0091Mw-2J; Tue, 24 Oct 2023 06:54:37 +0000 Received: from out-192.mta0.migadu.com ([2001:41d0:1004:224b::c0]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qvBJB-0091Ly-33 for linux-arm-kernel@lists.infradead.org; Tue, 24 Oct 2023 06:54:35 +0000 Date: Tue, 24 Oct 2023 06:54:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1698130469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Y344K2v/QoYv6GBIhlQV/tJyIyBscD+wZ3rA9wpbe7Y=; b=GALpxgXuysaPALHFTEE8RsP0pciRD9HuZLli5oC9O+yX1u3MFpmP/r6PtppSHyS/DVHi5q 84OImREekF7I4C6oSefuNN0kMo+xXNMT3E5SKRE0UzmqNuOgBbF3UFz43XMtGBoxaUeDZz G4z7Zp8Bgw//3oMY5EBuGSCQv2iKddI= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Oliver Upton To: Catalin Marinas 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-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231023_235434_124933_4D012E59 X-CRM114-Status: GOOD ( 12.47 ) 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 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. -- Thanks, Oliver _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel