linux-kernel - Re: [GIT PULL] Immutable branch between MFD, PWM and RTC due for the v5.13 merge window

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20210312184218.GL5348@sirena.org.uk>
Date:   Fri, 12 Mar 2021 18:42:18 +0000
From:   Mark Brown <broonie@...nel.org>
To:     Alexandre Belloni <alexandre.belloni@...tlin.com>
Cc:     Uwe Kleine-König 
        <u.kleine-koenig@...gutronix.de>, Lee Jones <lee.jones@...aro.org>,
        Jonathan Neuschäfer <j.neuschaefer@....net>,
        Heiko Stuebner <heiko@...ech.de>, devicetree@...r.kernel.org,
        Linus Walleij <linus.walleij@...aro.org>,
        Thierry Reding <thierry.reding@...il.com>,
        Sam Ravnborg <sam@...nborg.org>, linux-rtc@...r.kernel.org,
        Arnd Bergmann <arnd@...db.de>,
        Mauro Carvalho Chehab <mchehab+huawei@...nel.org>,
        Fabio Estevam <festevam@...il.com>,
        Daniel Palmer <daniel@...f.com>,
        Andy Shevchenko <andy.shevchenko@...il.com>,
        Andreas Kemnade <andreas@...nade.info>,
        NXP Linux Team <linux-imx@....com>,
        linux-pwm@...r.kernel.org, Stephan Gerhold <stephan@...hold.net>,
        allen <allen.chen@....com.tw>,
        Sascha Hauer <s.hauer@...gutronix.de>,
        Lubomir Rintel <lkundrak@...sk>,
        linux-arm-kernel@...ts.infradead.org,
        Alessandro Zummo <a.zummo@...ertech.it>,
        linux-kernel@...r.kernel.org, Rob Herring <robh+dt@...nel.org>,
        Pengutronix Kernel Team <kernel@...gutronix.de>,
        Heiko Stuebner <heiko.stuebner@...obroma-systems.com>,
        Josua Mayer <josua.mayer@....eu>,
        Shawn Guo <shawnguo@...nel.org>,
        "David S. Miller" <davem@...emloft.net>
Subject: Re: [GIT PULL] Immutable branch between MFD, PWM and RTC due for the
 v5.13 merge window

On Wed, Mar 10, 2021 at 12:54:08PM +0100, Alexandre Belloni wrote:
> On 10/03/2021 12:39:59+0100, Uwe Kleine-König 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.

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)