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=-11.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 C3B37C433E0 for ; Fri, 5 Feb 2021 10:22:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8103264E51 for ; Fri, 5 Feb 2021 10:22:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231344AbhBEKWe (ORCPT ); Fri, 5 Feb 2021 05:22:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:54648 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231328AbhBEKTb (ORCPT ); Fri, 5 Feb 2021 05:19:31 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id CEC5A64FED; Fri, 5 Feb 2021 10:18:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1612520300; bh=s6zOJkZnJEbm1xu0sX2TF5RgsugvUfGcTGQRbF8fYFQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=l8kKbOl3cDdM3E0eg11Cb78ojX1U42q1MLOpEbO9ohJ6ZsUhbIINgE9AGpi57xg07 nrjjNaNlf57dKR3WfAKi/M4HzTfRDGroizd8ACmJPeidm7+lvaabIXe7cQPaeWn9o/ A7dwUkMkXN6n1qunw/7DRnw+YFcS0Z5Mmkh9/ecc= Date: Fri, 5 Feb 2021 11:18:17 +0100 From: Greg Kroah-Hartman To: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= Cc: Russell King - ARM Linux admin , linux-fbdev@vger.kernel.org, Dmitry Torokhov , kvm@vger.kernel.org, Alexander Shishkin , Linus Walleij , alsa-devel@alsa-project.org, dri-devel@lists.freedesktop.org, Jaroslav Kysela , Eric Anholt , Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= , linux-i2c@vger.kernel.org, linux-spi@vger.kernel.org, Jiri Slaby , linux-stm32@st-md-mailman.stormreply.com, linux-watchdog@vger.kernel.org, linux-rtc@vger.kernel.org, Herbert Xu , Krzysztof Kozlowski , David Airlie , Alexandre Belloni , linux-serial@vger.kernel.org, linux-input@vger.kernel.org, Ulf Hansson , Guenter Roeck , Mike Leach , Maxime Coquelin , Alexandre Torgue , Arnd Bergmann , Suzuki K Poulose , coresight@lists.linaro.org, Vladimir Zapolskiy , Eric Auger , Alex Williamson , Mark Brown , Matt Mackall , Dan Williams , Wim Van Sebroeck , kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org, Alessandro Zummo , Mathieu Poirier , Cornelia Huck , linux-mmc@vger.kernel.org, Takashi Iwai , linux-kernel@vger.kernel.org, Vinod Koul , linux-crypto@vger.kernel.org, Daniel Vetter , Leo Yan , dmaengine@vger.kernel.org Subject: Re: [GIT PULL] immutable branch for amba changes targeting v5.12-rc1 Message-ID: References: <20210126165835.687514-1-u.kleine-koenig@pengutronix.de> <20210202135350.36nj3dmcoq3t7gcf@pengutronix.de> <20210204165224.GA1463@shell.armlinux.org.uk> <20210204165951.GB1463@shell.armlinux.org.uk> <20210204181551.ethtuzm65flujmwe@pengutronix.de> <20210205093744.kr4rc7yvfiq6wimq@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20210205093744.kr4rc7yvfiq6wimq@pengutronix.de> Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org 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? thanks, greg k-h