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=-7.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=no 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 0D967C4332B for ; Fri, 12 Mar 2021 18:44:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DA54464DEF for ; Fri, 12 Mar 2021 18:44:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233868AbhCLSng (ORCPT ); Fri, 12 Mar 2021 13:43:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:46256 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233832AbhCLSnc (ORCPT ); Fri, 12 Mar 2021 13:43:32 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5E3C164DEF; Fri, 12 Mar 2021 18:43:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1615574611; bh=sKX2rrb6XkiYk5GQI8k4S0Xcn1WhEhpPzkJYF4w5HQY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=WGa+OIImtBLT6B9fBhRu9whkob+oyS22VSvs/u9Hl+jTC06bBuhomU1HA92pU+7qP V44Py2/oLpwuvLVslyFSAmiQpPhUViqyPypv1+1luj2tmFp6mHHF1+LdrbbkgtX6MC A0Hkek/kJvJHWBF5rOosCmIDbpmLNmz+w078KgNWiZiDkTObqd+IneILAMFj5sg87o I+ynB0YhhFoPyTzO/naeUawbmx7KINbkX+4LnCvkg6dhZg6EwoQzzqFPGFwb0e4siB UK9w9UmnnxtwxGMPlC1fQhr478bXztBwBXb4VC+dO95r2mbwgU2zZge2x3LnKMak5n GcJTCFp0+Lwcg== Date: Fri, 12 Mar 2021 18:42:18 +0000 From: Mark Brown To: Alexandre Belloni Cc: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= , 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 , 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: <20210312184218.GL5348@sirena.org.uk> References: <20210124214127.3631530-1-j.neuschaefer@gmx.net> <20210301102826.GK641347@dell> <20210309200520.GA4931@dell> <20210310113959.dnokjrt7dos43fx6@pengutronix.de> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="sMZCuqyhuhd4ycTi" Content-Disposition: inline In-Reply-To: X-Cookie: Lake Erie died for your sins. User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --sMZCuqyhuhd4ycTi Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Mar 10, 2021 at 12:54:08PM +0100, Alexandre Belloni wrote: > On 10/03/2021 12:39:59+0100, Uwe Kleine-K=F6nig wrote: > > 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. That doesn't exactly address the issue - the goal was to reduce the number of commits that a bisect could hit which have the swapfile bug but lack the fix. How serious a few extra commits on a shared branch really are is of course an open question though. --sMZCuqyhuhd4ycTi Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmBLtgkACgkQJNaLcl1U h9CB+wf/ZO7mIUoi7YJ5RncEf1EitAjvU8hcKZiAZOlXiI1OS8PQOpWUQ5K+RbDD NJIy7txxdvWxHDxl1pG7f/3iZ0j1S/3VWPDj8U6L04HcMCivzVFsfGME8coY6V8P GnJDXv/7OCbnDvmUz8TYpcKRI+OSbOVadnQH2eUoGz1BZ9AAyJ1LL1qHKx7vOp2Z rwoSkqkJwBVyuR+bjHFR4vHeBLfcxyBJ0DJG0Cb7INwK1D6t1qbnk90+mSFx3myS 3ji8G1NRtqfZH5cG76rCoWnXiaDRCPhnanQeI3p3qCEF5PDJQG7ODmWY95HJyZJh RNgn4Del1wOcCkNVuV+u5M9+dLu73g== =ckES -----END PGP SIGNATURE----- --sMZCuqyhuhd4ycTi--