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 E93CDC433FE for ; Tue, 8 Feb 2022 11:37: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=4jJlk8iEFsu7tT/d5gc1qWBaA4IsxfkalGcMXFOwky8=; b=2zFMzPWh7vpS5l +2HoZYaUMAOeHE2FsYx84lNndR3Jf8gFYcKSui85F7yP1UN1P2pQaAv3vHczHQ9Q0pW4/anqmrXMX xKH+BYPpDJ7ISI+eia40lZt9er0CwmHi+8KBvpcYIbOUlZneAv5M0SspbvoLj1oTny06OXsaiV4bd Qw7cjpYVPhdQL1iPO6cVSXRIGm6n1a90xoM5FhFm3KBCBIl6yXsCRZ6OuRGUitKeGgqyf/zYdTG1P kApYdkqOKkv+OvjZYnE9AERRCYh1m4/qPb3MAgzuYDbMKb7U5DUcf4KfD1XpWjH3e+uKhpoLA9xlh PMT0IhGtFGsTU/nnKYpA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nHOmm-00DdEr-IF; Tue, 08 Feb 2022 11:35:52 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nHOmh-00DdDM-SE for linux-arm-kernel@lists.infradead.org; Tue, 08 Feb 2022 11:35:50 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5A7BFED1; Tue, 8 Feb 2022 03:35:46 -0800 (PST) Received: from bogus (unknown [10.57.41.150]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9ED873F73B; Tue, 8 Feb 2022 03:35:44 -0800 (PST) Date: Tue, 8 Feb 2022 11:34:57 +0000 From: Sudeep Holla To: Arnd Bergmann Cc: Olof Johansson , ARM SoC Team , SoC Team , Sudeep Holla , ALKML , Cristian Marussi Subject: Re: [GIT PULL] firmware: arm_scmi: Updates for v5.17 Message-ID: <20220208113457.waf4fdujnbtvneka@bogus> References: <20211222141342.56395-1-sudeep.holla@arm.com> <20220107113740.f4zlz25largdjcfd@bogus> <20220108202410.GA1057@lx2k> <20220208103327.hjld33z3lkfrpu6k@bogus> 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-20220208_033547_987745_13946AC7 X-CRM114-Status: GOOD ( 19.51 ) 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 Tue, Feb 08, 2022 at 12:14:25PM +0100, Arnd Bergmann wrote: > On Tue, Feb 8, 2022 at 11:33 AM Sudeep Holla wrote: > > On Tue, Feb 08, 2022 at 11:00:43AM +0100, Arnd Bergmann wrote: > > > As the contents are still fine, I could offer to either merge the branch again > > > for v5.18, or I can drop it and wait for a new pull request from you, please > > > let me know your preference. > > > > > > > Is it OK if I merge this tag with v5.17-rc1 as base and load it with any > > new v5.18 material on the top ? I just want to avoid rebasing as the same time > > some of the new material depend on these changes. Let me know if that > > is fine. I am open to any other suggestions too. > > Yes, I think that is ok, as long as you start a branch from v5.17-rc1 and merge > the old contents into the new branch, rather than back-merging the -rc1 tag > into your existing branch. This way, the git history still makes sense > across the merges. Thanks for confirming my understanding. -- Regards, Sudeep _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel