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 28B6FC433F5 for ; Mon, 28 Feb 2022 14:31:20 +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=JLwilZFfxtORNaFdT17zKUIGQosbVwUnUNxfsLZNvDc=; b=DMaTkrOCiFyui2 qFHkWdDcq3WhYFAl2Z1qQofBU2YYt7deU7vMob4CIG3/NqVd4R2E9/zUKuDCvM9DsSp7UQkvN1+VQ gV1iDD3EOXyVYcBZ9fSGfUVH717qtRsKkaIvHbfMZoDhwxfInt38djfD37nyR3j787LjEaxRSFRYq FpK6hyr8FtlTZdjp5qQkbpdJQOohFOFQOaxWEx0dhVerUOSJYE0ZOb0ykK1/iV6wJPSS8VeTDJT1v /3UzqrWYtXgM5C8joCJPukM+Kd8NXsXE8omhyLGWcr4aSJK81BXm0UsSJIWxhXmXQ6ywdm2fcrdY1 QW7WJsHoL2zlu67O600w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOh22-00Ctug-7W; Mon, 28 Feb 2022 14:29:47 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOgor-00Cov5-Fg for linux-arm-kernel@lists.infradead.org; Mon, 28 Feb 2022 14:16:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Sender:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=7JH27kgNzOy1tKBQvWxq1q2JCc5BGoHolGNfaMEOzu8=; b=BRuCACnPE2qoIOITPJIwVEHUHe 9FdvUaEOiLASFDuM/zNbRJVh+hgIDa12F3JzNlUDV7iGFhOGL49DBfP3XbEv7lCSZnIToYJ2qofdH u9AG40RYjYpcIhKYOPQ2PgvkktUOsPpEer692gw/ax3M4BCW2e/4X21C+jv39HROPyATZz0FhuRgX cPJdVizAYxohVP8zhmboBdVesbgOp35lXenkc9SlcEW83rbzwUm9J+sfhH+24UN6HtbtXuAaqo499 0DstfGITRBW4jPHmswBCIDTOi952K/MfkM7ugigGBQZkkpm3QGM1qe9QFkRSqdLeUGa8hYjjwjQ4C KsQXfNdg==; Received: from shell.armlinux.org.uk ([fd8f:7570:feb6:1:5054:ff:fe00:4ec]:57564) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nOgoo-0008Qz-KW; Mon, 28 Feb 2022 14:16:06 +0000 Received: from linux by shell.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1nOgoo-0006EH-0V; Mon, 28 Feb 2022 14:16:06 +0000 Date: Mon, 28 Feb 2022 14:16:05 +0000 From: "Russell King (Oracle)" To: Ard Biesheuvel Cc: Linux ARM Subject: Re: [GIT PULL v2] ARM ftrace fixes for Thumb2, Clang and the EABI unwinder Message-ID: References: <20220214143735.112800-1-ardb@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-20220228_061609_566512_32EB3BF8 X-CRM114-Status: UNSURE ( 9.41 ) X-CRM114-Notice: Please train this message. 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, Feb 28, 2022 at 03:11:31PM +0100, Ard Biesheuvel wrote: > On Mon, 28 Feb 2022 at 15:07, Russell King (Oracle) > wrote: > > Unsurprisingly, this increases the amount of conflicts (both > > arch/arm/Kconfig* files) when merging it with v5.17-rc1. > > Right, that does not surprise me either. > > Does this mean this needs to wait for v5.19? No, I've merged it now, just noting the additional conflicts, and through the power of git rerere... -- RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last! _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel