From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-fbdev@vger.kernel.org, "Cornelia Huck" <cohuck@redhat.com>,
kvm@vger.kernel.org, "David Airlie" <airlied@linux.ie>,
"Linus Walleij" <linus.walleij@linaro.org>,
"Alexandre Belloni" <alexandre.belloni@bootlin.com>,
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,
"Herbert Xu" <herbert@gondor.apana.org.au>,
"Russell King - ARM Linux admin" <linux@armlinux.org.uk>,
"Krzysztof Kozlowski" <krzk@kernel.org>,
"Alexander Shishkin" <alexander.shishkin@linux.intel.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, alsa-devel@alsa-project.org,
"Suzuki K Poulose" <suzuki.poulose@arm.com>,
linux-kernel@vger.kernel.org, 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>,
kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org,
"Alessandro Zummo" <a.zummo@towertech.it>,
"Mathieu Poirier" <mathieu.poirier@linaro.org>,
"Dmitry Torokhov" <dmitry.torokhov@gmail.com>,
linux-mmc@vger.kernel.org, "Takashi Iwai" <tiwai@suse.com>,
linux-spi@vger.kernel.org, "Vinod Koul" <vkoul@kernel.org>,
"Arnd Bergmann" <arnd@arndb.de>,
linux-crypto@vger.kernel.org,
"Maxime Coquelin" <mcoquelin.stm32@gmail.com>,
"Leo Yan" <leo.yan@linaro.org>,
dmaengine@vger.kernel.org
Subject: Re: [GIT PULL] immutable branch for amba changes targeting v5.12-rc1
Date: Fri, 5 Feb 2021 11:56:15 +0100 [thread overview]
Message-ID: <20210205105615.qumu45huvntf2v4j@pengutronix.de> (raw)
In-Reply-To: <YB0baUzgvpd+EoO6@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 4138 bytes --]
On Fri, Feb 05, 2021 at 11:18:17AM +0100, Greg Kroah-Hartman wrote:
> On Fri, Feb 05, 2021 at 10:37:44AM +0100, Uwe Kleine-König wrote:
> > Hello Russell, hello Greg,
> >
> > On Thu, Feb 04, 2021 at 07:15:51PM +0100, Uwe Kleine-König wrote:
> > > 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.
> >
> > OK, the current state is that Russell applied the patch fixing
> > drivers/mailbox/arm_mhuv2.c on top of merging my first tag.
> >
> > So the way forward now is that Greg pulls
> >
> > git://git.armlinux.org.uk/~rmk/linux-arm.git devel-stable
> >
> > which currently points to
> >
> > 860660fd829e ("ARM: 9055/1: mailbox: arm_mhuv2: make remove callback return void")
> >
> > , into his tree that contains the hwtracing changes that conflict with my
> > changes. @Greg: Is this good enough, or do you require a dedicated tag
> > to pull that?
> >
> > I think these conflicting hwtracing changes are not yet in any of Greg's
> > trees (at least they are not in next).
> >
> > When I pull
> >
> > https://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git next
> >
> > (currently pointing to 4e73ff249184 ("coresight: etm4x: Handle accesses
> > to TRCSTALLCTLR")) into 860660fd829e, I get a conflict in
> > drivers/hwtracing/coresight/coresight-etm4x-core.c as expected. My
> > resolution looks as follows:
>
> Ok, my resolution looked a bit different.
>
> Can you pull my char-misc-testing branch and verify I got this all
> pulled in correctly?
minor side-note: mentioning the repo url would have simplified that test.
I looked at
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc-testing
commit 0573d3fa48640f0fa6b105ff92dcb02b94d6c1ab now.
I didn't compile test, but I'm willing to bet your resolution is wrong.
You have no return statement in etm4_remove_dev() but its return type is
int and etm4_remove_amba() still returns int but should return void.
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 --]
next prev parent reply other threads:[~2021-02-05 11:07 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-26 16:58 [PATCH v3 0/5] amba: minor fix and various cleanups Uwe Kleine-König
2021-01-26 16:58 ` [PATCH v3 4/5] amba: Make the remove callback return void Uwe Kleine-König
2021-01-26 17:08 ` Suzuki K Poulose
2021-01-26 17:56 ` Uwe Kleine-König
2021-01-26 19:05 ` Russell King - ARM Linux admin
2021-01-26 17:30 ` Vinod Koul
2021-01-26 19:24 ` Guenter Roeck
2021-01-27 6:47 ` Wolfram Sang
2021-01-27 6:50 ` Takashi Iwai
2021-01-27 8:12 ` Vladimir Zapolskiy
2021-01-27 12:03 ` Greg Kroah-Hartman
2021-02-03 13:18 ` Auger Eric
2021-02-02 10:49 ` [PATCH v3 0/5] amba: minor fix and various cleanups Russell King - ARM Linux admin
2021-02-03 7:45 ` Uwe Kleine-König
2021-02-02 13:53 ` [GIT PULL] immutable branch for amba changes targeting v5.12-rc1 Uwe Kleine-König
2021-02-02 14:06 ` Greg Kroah-Hartman
2021-02-04 16:52 ` Russell King - ARM Linux admin
2021-02-04 16:56 ` Greg Kroah-Hartman
2021-02-04 16:59 ` Russell King - ARM Linux admin
2021-02-04 18:15 ` Uwe Kleine-König
2021-02-05 9:37 ` Uwe Kleine-König
2021-02-05 10:18 ` Greg Kroah-Hartman
2021-02-05 10:56 ` Uwe Kleine-König [this message]
2021-02-05 11:07 ` Greg Kroah-Hartman
2021-02-02 19:43 ` [PATCH] mailbox: arm_mhuv2: make remove callback return void Uwe Kleine-König
2021-02-03 2:57 ` Viresh Kumar
2021-02-02 21:35 ` [GIT PULL] immutable branch for amba changes targeting v5.12-rc1 Uwe Kleine-König
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210205105615.qumu45huvntf2v4j@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=a.zummo@towertech.it \
--cc=airlied@linux.ie \
--cc=alex.williamson@redhat.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=alexandre.belloni@bootlin.com \
--cc=alexandre.torgue@st.com \
--cc=alsa-devel@alsa-project.org \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=cohuck@redhat.com \
--cc=coresight@lists.linaro.org \
--cc=dan.j.williams@intel.com \
--cc=daniel@ffwll.ch \
--cc=dmaengine@vger.kernel.org \
--cc=dmitry.torokhov@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=eric.auger@redhat.com \
--cc=eric@anholt.net \
--cc=gregkh@linuxfoundation.org \
--cc=herbert@gondor.apana.org.au \
--cc=jirislaby@kernel.org \
--cc=kernel@pengutronix.de \
--cc=krzk@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=leo.yan@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=linux@roeck-us.net \
--cc=mathieu.poirier@linaro.org \
--cc=mcoquelin.stm32@gmail.com \
--cc=mike.leach@linaro.org \
--cc=mpm@selenic.com \
--cc=perex@perex.cz \
--cc=suzuki.poulose@arm.com \
--cc=tiwai@suse.com \
--cc=u.kleine-koenig.org@pengutronix.de \
--cc=ulf.hansson@linaro.org \
--cc=vkoul@kernel.org \
--cc=vz@mleia.com \
--cc=wim@linux-watchdog.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).