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=-8.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 841F1C433DB for ; Fri, 5 Feb 2021 11:07:14 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1073260241 for ; Fri, 5 Feb 2021 11:07:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1073260241 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 611286F3FD; Fri, 5 Feb 2021 11:07:13 +0000 (UTC) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id E2CCD6F3FD for ; Fri, 5 Feb 2021 11:07:12 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 7C71064E27; Fri, 5 Feb 2021 11:07:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1612523232; bh=Nwtz3BUqSevf1s1e0A4/LfXqpax1F3NKU3Zl0rZrhyU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=z3iM1B16HIK+kzq5DdPhk4pYYltyyjSK8c9ulRSTyKEvO41jovJreH8Xz0RMtHOV2 ruA/A2WS6VMUHJz0QfdlmNKVJNNXdklaLg6Lm8dDlfDgKTxOW/tbDIbscItS3ul0Kr ikt5qpBkp9i1zI8aVEMs6D0Sc58DYFERyojRWtGY= Date: Fri, 5 Feb 2021 12:07:09 +0100 From: Greg Kroah-Hartman To: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= 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> <20210205105615.qumu45huvntf2v4j@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210205105615.qumu45huvntf2v4j@pengutronix.de> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Belloni , Dmitry Torokhov , kvm@vger.kernel.org, David Airlie , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Jaroslav Kysela , Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= , linux-i2c@vger.kernel.org, Jiri Slaby , linux-stm32@st-md-mailman.stormreply.com, linux-watchdog@vger.kernel.org, linux-rtc@vger.kernel.org, Herbert Xu , Takashi Iwai , Russell King - ARM Linux admin , Krzysztof Kozlowski , Alexander Shishkin , linux-serial@vger.kernel.org, linux-input@vger.kernel.org, Ulf Hansson , Guenter Roeck , Mike Leach , Maxime Coquelin , Alexandre Torgue , alsa-devel@alsa-project.org, 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, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, Vinod Koul , Arnd Bergmann , linux-crypto@vger.kernel.org, Leo Yan , dmaengine@vger.kernel.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Fri, Feb 05, 2021 at 11:56:15AM +0100, Uwe Kleine-K=F6nig wrote: > 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=F6nig wrote: > > > Hello Russell, hello Greg, > > > = > > > On Thu, Feb 04, 2021 at 07:15:51PM +0100, Uwe Kleine-K=F6nig 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 wrot= e: > > > > > > On Thu, Feb 04, 2021 at 04:52:24PM +0000, Russell King - ARM Li= nux 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 ob= jects, I will > > > > > > > > do so... > > > > > > > = > > > > > > > Greg, did you end up pulling this after all? If not, Uwe prod= uced 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 p= atch > > > > > on top. > > > > > = > > > > > The only reason to produce an "immutable" branch is if it's the b= asis > > > > > 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 pa= tch > > > > squashed in. Obviously only one of them have to be picked and I hop= ed > > > > you (=3D 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 wit= h 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 Gre= g'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 access= es > > > 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. Sorry, I thought you had it based on the above info. > I looked at > = > https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git cha= r-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. Can you send a patch to fix this up? thanks, greg k-h _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel