From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 27 Jun 2025 14:41:22 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1uV8OQ-00BcL9-1I for lore@lore.pengutronix.de; Fri, 27 Jun 2025 14:41:22 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1uV8OP-0003MP-NT; Fri, 27 Jun 2025 14:41:21 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1uV8ON-0003MB-W0; Fri, 27 Jun 2025 14:41:20 +0200 Received: from pty.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::c5]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1uV8ON-005cFE-2c; Fri, 27 Jun 2025 14:41:19 +0200 Received: from rhi by pty.whiteo.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1uV8ON-003ZtY-2D; Fri, 27 Jun 2025 14:41:19 +0200 Date: Fri, 27 Jun 2025 14:41:19 +0200 From: Roland Hieber To: Robert Schwebel Message-ID: <1751027663-d9cef2d28500d103df012582@pty> References: <20250625131339.210022-1-rhi@pengutronix.de> <1750926856-23190c7c294778c3643b149d@pty> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1750926856-23190c7c294778c3643b149d@pty> Subject: Re: [DistroKit] [PATCH] fixup! v7a: barebox: version bump 2025.05.0 -> 2025.06.0 X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: distrokit@pengutronix.de Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false On Thu, Jun 26, 2025 at 11:03:19AM +0200, Roland Hieber wrote: > On Wed, Jun 25, 2025 at 07:38:21PM +0200, Robert Schwebel wrote: > > Could you rebase to next? This does not apply any more. > > It looks to me like this patch is already fixed-up in commit c7a728d78d49 > (upstream/next) Mo 2025-06-23 11:23:38 (Roland Hieber) "v7a: barebox: version > bump 2025.05.0 -> 2025.06.0". But the other one ("fixup! ptxdist: version bump > 2025.05 -> 2025.06") is not yet. However, if I rebase on top of c7a728d78d49, it > doesn't seem to change the patch content of that fixup. > > I've pushed my 'next' branch to ssh://public@git.pengutronix.de/rhi/DistroKit so > you could have a look if you want (Note that I also changed it from a "fixup!" > to a "squash!" so my additional log message doesn't get lost in rebasing). I've sent the squashed version in https://lore.distrokit.org/distrokit/20250627123252.1985354-1-rhi@pengutronix.de/ , it can be applied before c7a728d78d49 (current next branch) instead of 4e6825497be6. - Roland > > On Wed, Jun 25, 2025 at 07:36:31PM +0200, Robert Schwebel wrote: > > > Applied & squashed into original patch in next. > > > > > > On Wed, Jun 25, 2025 at 03:13:39PM +0200, Roland Hieber wrote: > > > > [rhi: ptxdist-2025.06.0 now writes two checksums in kconfig diffs] > > > > Signed-off-by: Roland Hieber > > > > --- > > > > Robert, can you squash this into my original patch? I didn't expect that > > > > it would be applied after Fabian's PTXdist 2025.06.0 update, which > > > > now writes two checksums in config diffs. > > > > > > > > - Roland > > > > > > > > configs/platform-v7a/barebox-at91.config.diff | 1 + > > > > 1 file changed, 1 insertion(+) > > > > > > > > diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff > > > > index 162ed9f4791e..cf3de80f23f2 100644 > > > > --- a/configs/platform-v7a/barebox-at91.config.diff > > > > +++ b/configs/platform-v7a/barebox-at91.config.diff > > > > @@ -1,4 +1,5 @@ > > > > 0cb3165d3c2844da9a6d01e5407289ca > > > > +b2da2644182531b3b6a4a2c9ec7ff908 > > > > CONFIG_ARCH_AT91=y > > > > # CONFIG_ARCH_BCM283X is not set > > > > # CONFIG_ARCH_IMX is undefined > > > > -- > > > > 2.39.5 > > > > > > > > > > > > > > > > > > -- > > > Pengutronix e.K. | Dipl.-Ing. Robert Schwebel | > > > Steuerwalder Str. 21 | https://www.pengutronix.de/ | > > > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > > > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 | > > > > > > > > > > -- > > Pengutronix e.K. | Dipl.-Ing. Robert Schwebel | > > Steuerwalder Str. 21 | https://www.pengutronix.de/ | > > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 | > > > > -- > Roland Hieber, Pengutronix e.K. | rhi@pengutronix.de | > Steuerwalder Str. 21 | https://www.pengutronix.de/ | > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | > > -- Roland Hieber, Pengutronix e.K. | rhi@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |