From: Robert Schwebel <r.schwebel@pengutronix.de>
To: Roland Hieber <rhi@pengutronix.de>
Cc: distrokit@pengutronix.de
Subject: Re: [DistroKit] [PATCH] fixup! v7a: barebox: version bump 2025.05.0 -> 2025.06.0
Date: Wed, 25 Jun 2025 19:38:21 +0200 [thread overview]
Message-ID: <aFw0Dd-aX8HWZeb2@pengutronix.de> (raw)
In-Reply-To: <aFwznzw4TVwsOeO-@pengutronix.de>
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 <rhi@pengutronix.de>
> > ---
> > 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 |
next prev parent reply other threads:[~2025-06-25 17:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-23 9:23 [DistroKit] [PATCH] " Roland Hieber
2025-06-23 9:56 ` Robert Schwebel
2025-06-25 13:13 ` [DistroKit] [PATCH] fixup! " Roland Hieber
2025-06-25 17:36 ` Robert Schwebel
2025-06-25 17:38 ` Robert Schwebel [this message]
2025-06-26 9:03 ` Roland Hieber
2025-06-27 12:41 ` Roland Hieber
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=aFw0Dd-aX8HWZeb2@pengutronix.de \
--to=r.schwebel@pengutronix.de \
--cc=distrokit@pengutronix.de \
--cc=rhi@pengutronix.de \
/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