From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 25 Jun 2025 19:38:23 +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 1uUU4l-00B09I-2I for lore@lore.pengutronix.de; Wed, 25 Jun 2025 19:38:23 +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 1uUU4l-00055V-4i; Wed, 25 Jun 2025 19:38:23 +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 1uUU4j-00055H-JK; Wed, 25 Jun 2025 19:38:21 +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 1uUU4j-005Jge-1K; Wed, 25 Jun 2025 19:38:21 +0200 Received: from rsc by pty.whiteo.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1uUU4j-00HEbd-11; Wed, 25 Jun 2025 19:38:21 +0200 Date: Wed, 25 Jun 2025 19:38:21 +0200 From: Robert Schwebel To: Roland Hieber Message-ID: References: <20250625131339.210022-1-rhi@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain 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 Could you rebase to next? This does not apply any more. 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 |