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 X-Spam-Level: X-Spam-Status: No, score=-14.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PULL_REQUEST, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A0EBC433E0 for ; Wed, 10 Mar 2021 11:55:56 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A47BA64F7E for ; Wed, 10 Mar 2021 11:55:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A47BA64F7E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bootlin.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; 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=IU5UvYz53Gw2ynNvYaDbyYLiSHUm58BNJtLmHDf0QTw=; b=PKMQEch6kboA+5cvSwMv7DyFJ O2V5hKvqUEZPxR5R4hNtdYjhtK3kwAflR4Q3hH+xpT29At9Jse47Z5SI9FEzIubGo/IbDQNBUQdPV kOvIv4YK9noXhapiNX+EKURaP4unryul70iZgr1tj84T4vrVyJzfV2UP3t6z9iZIkILtd2gI4l4zM gZ8Aro+SzEdsW9nEB+aSO6d7rpAUQrghiZU7aLECjngkm58/UhbFaOtvjwi2Sm0M0b6FdCmd6wL9e 74EbSfkn9Et/JRYYlr32xDu4OVeGZTt7uyohI0VB4GvW+Xyi/Z3mTDLbMGhVag1dr8GSav+tbc1jN Vb9hron9w==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lJxPy-006laO-8Q; Wed, 10 Mar 2021 11:54:22 +0000 Received: from relay3-d.mail.gandi.net ([217.70.183.195]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lJxPp-006lZm-7S for linux-arm-kernel@lists.infradead.org; Wed, 10 Mar 2021 11:54:17 +0000 X-Originating-IP: 90.65.108.55 Received: from localhost (lfbn-lyo-1-1676-55.w90-65.abo.wanadoo.fr [90.65.108.55]) (Authenticated sender: alexandre.belloni@bootlin.com) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 4A89660009; Wed, 10 Mar 2021 11:54:08 +0000 (UTC) Date: Wed, 10 Mar 2021 12:54:08 +0100 From: Alexandre Belloni To: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= Cc: Lee Jones , Jonathan =?iso-8859-1?Q?Neusch=E4fer?= , Heiko Stuebner , devicetree@vger.kernel.org, Linus Walleij , Thierry Reding , Sam Ravnborg , linux-rtc@vger.kernel.org, Arnd Bergmann , Mauro Carvalho Chehab , Fabio Estevam , Daniel Palmer , Andy Shevchenko , Andreas Kemnade , NXP Linux Team , linux-pwm@vger.kernel.org, Stephan Gerhold , allen , Sascha Hauer , Lubomir Rintel , Mark Brown , linux-arm-kernel@lists.infradead.org, Alessandro Zummo , linux-kernel@vger.kernel.org, Rob Herring , Pengutronix Kernel Team , Heiko Stuebner , Josua Mayer , Shawn Guo , "David S. Miller" Subject: Re: [GIT PULL] Immutable branch between MFD, PWM and RTC due for the v5.13 merge window Message-ID: References: <20210124214127.3631530-1-j.neuschaefer@gmx.net> <20210301102826.GK641347@dell> <20210309200520.GA4931@dell> <20210310113959.dnokjrt7dos43fx6@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210310113959.dnokjrt7dos43fx6@pengutronix.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210310_115414_776429_15E534A8 X-CRM114-Status: GOOD ( 25.21 ) 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="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 10/03/2021 12:39:59+0100, Uwe Kleine-K=F6nig wrote: > Hello Lee, > = > On Tue, Mar 09, 2021 at 08:05:20PM +0000, Lee Jones wrote: > > On Mon, 01 Mar 2021, Lee Jones wrote: > > = > > > The following changes since commit fe07bfda2fb9cdef8a4d4008a409bb02f3= 5f1bd8: > > > = > > > Linux 5.12-rc1 (2021-02-28 16:05:19 -0800) > > > = > > > are available in the Git repository at: > > > = > > > git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-pw= m-rtc-v5.13 > > > = > > > for you to fetch changes up to 80629611215d1c5d52ed3cf723fd6d24a58725= 04: > > > = > > > MAINTAINERS: Add entry for Netronix embedded controller (2021-03-01= 10:26:17 +0000) > > > = > > > ---------------------------------------------------------------- > > > Immutable branch between MFD, PWM and RTC due for the v5.13 merge win= dow > > > = > > > ---------------------------------------------------------------- > > > [...] > > = > > FYI, if anyone has pulled this, they should probably rebase it onto > > v5.12-rc2 and delete the v5.12-rc1 tag from their tree: > > = > > https://lwn.net/Articles/848431/ > = > I'm not directly affected, but I wonder: The idea of an immutable branch > is that the same history gets included in different trees. If now each > maintainer rebases individually the result isn't the same > history any more in each tree which somewhat defeats the idea of using > immutable branches. > = > IMHO there are two ways forward: Either someone (Lee again?) creates a > new pull request for this series rebased on -rc2; or we accept that > these few patches are based on -rc1. For the latter it would be > beneficial to merge the tag into a tree that is already based on -rc2. > = The solution is simply for the maintainers merging the immutable branch to do that in a branch based on -rc2. Eg. I've rebased rtc-next on -rc2 (fast forward, I didn't have any patch). I can now merge this branch if necessary, problem solved. If you can't rebased, nothing prevents you from merging -rc2 in any branch. -- = Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel