Re: [GIT PULL] immutable branch for amba changes targeting v5.12-rc1 - Uwe Kleine-König

From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Russell King - ARM Linux admin <linux@armlinux.org.uk>
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
	linux-fbdev@vger.kernel.org,
	"Alessandro Zummo" <a.zummo@towertech.it>,
	kvm@vger.kernel.org,
	"Alexander Shishkin" <alexander.shishkin@linux.intel.com>,
	"Linus Walleij" <linus.walleij@linaro.org>,
	alsa-devel@alsa-project.org, dri-devel@lists.freedesktop.org,
	"Jaroslav Kysela" <perex@perex.cz>,
	"Eric Anholt" <eric@anholt.net>,
	"Uwe Kleine-König" <u.kleine-koenig.org@pengutronix.de>,
	linux-i2c@vger.kernel.org, "Jiri Slaby" <jirislaby@kernel.org>,
	linux-stm32@st-md-mailman.stormreply.com,
	"Alexandre Torgue" <alexandre.torgue@st.com>,
	linux-rtc@vger.kernel.org, "Cornelia Huck" <cohuck@redhat.com>,
	"Herbert Xu" <herbert@gondor.apana.org.au>,
	"Takashi Iwai" <tiwai@suse.com>,
	"Krzysztof Kozlowski" <krzk@kernel.org>,
	"David Airlie" <airlied@linux.ie>,
	"Alexandre Belloni" <alexandre.belloni@bootlin.com>,
	linux-serial@vger.kernel.org, linux-input@vger.kernel.org,
	"Ulf Hansson" <ulf.hansson@linaro.org>,
	"Guenter Roeck" <linux@roeck-us.net>,
	"Mike Leach" <mike.leach@linaro.org>,
	linux-watchdog@vger.kernel.org, "Arnd Bergmann" <arnd@arndb.de>,
	"Suzuki K Poulose" <suzuki.poulose@arm.com>,
	coresight@lists.linaro.org, "Vladimir Zapolskiy" <vz@mleia.com>,
	"Eric Auger" <eric.auger@redhat.com>,
	"Alex Williamson" <alex.williamson@redhat.com>,
	"Mark Brown" <broonie@kernel.org>,
	"Matt Mackall" <mpm@selenic.com>,
	"Daniel Vetter" <daniel@ffwll.ch>,
	"Dan Williams" <dan.j.williams@intel.com>,
	"Wim Van Sebroeck" <wim@linux-watchdog.org>,
	linux-arm-kernel@lists.infradead.org,
	"Maxime Coquelin" <mcoquelin.stm32@gmail.com>,
	"Mathieu Poirier" <mathieu.poirier@linaro.org>,
	"Dmitry Torokhov" <dmitry.torokhov@gmail.com>,
	linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-spi@vger.kernel.org, "Vinod Koul" <vkoul@kernel.org>,
	linux-crypto@vger.kernel.org, kernel@pengutronix.de,
	"Leo Yan" <leo.yan@linaro.org>,
	dmaengine@vger.kernel.org
Subject: Re: [GIT PULL] immutable branch for amba changes targeting v5.12-rc1
Date: Thu, 4 Feb 2021 19:15:51 +0100	[thread overview]
Message-ID: <20210204181551.ethtuzm65flujmwe@pengutronix.de> (raw)
In-Reply-To: <20210204165951.GB1463@shell.armlinux.org.uk>

[-- Attachment #1: Type: text/plain, Size: 2105 bytes --]

On Thu, Feb 04, 2021 at 04:59:51PM +0000, Russell King - ARM Linux admin wrote:
> On Thu, Feb 04, 2021 at 05:56:50PM +0100, Greg Kroah-Hartman wrote:
> > On Thu, Feb 04, 2021 at 04:52:24PM +0000, Russell King - ARM Linux admin wrote:
> > > On Tue, Feb 02, 2021 at 03:06:05PM +0100, Greg Kroah-Hartman wrote:
> > > > I'm glad to take this through my char/misc tree, as that's where the
> > > > other coresight changes flow through.  So if no one else objects, I will
> > > > do so...
> > > 
> > > Greg, did you end up pulling this after all? If not, Uwe produced a v2.
> > > I haven't merged v2 yet as I don't know what you've done.
> > 
> > I thought you merged this?
> 
> I took v1, and put it in a branch I've promised in the past not to
> rebase/rewind. Uwe is now asking for me to take a v2 or apply a patch
> on top.
> 
> The only reason to produce an "immutable" branch is if it's the basis
> for some dependent work and you need that branch merged into other
> people's trees... so the whole "lets produce a v2" is really odd
> workflow... I'm confused about what I should do, and who has to be
> informed which option I take.
> 
> I'm rather lost here too.

Sorry to have cause this confusion. After I saw that my initial tag
missed to adapt a driver I wanted to make it easy for you to fix the
situation.
So I created a patch to fix it and created a second tag with the patch
squashed in. Obviously only one of them have to be picked and I hoped
you (= Russell + Greg) would agree which option to pick.

My preference would be if you both pick up v2 of the tag to yield a
history that is bisectable without build problems, but if Russell (who
already picked up the broken tag) considers his tree immutable and so
isn't willing to rebase, then picking up the patch is the way to go.

I suggest that Russell descides which option he wants to pick and tells
Greg to do the same!?

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]