From: Ian Campbell <ijc@hellion.org.uk>
To: devicetree@vger.kernel.org
Cc: Tom Rini <trini@konsulko.com>
Subject: Re: devicetree-rebasing history incorrect from v7.2-rc1-dts onwards
Date: Sun, 23 Aug 2026 11:41:44 +0100 [thread overview]
Message-ID: <c0ef5f140cb5e4e1b953b42c3518a5a432c67a93.camel@hellion.org.uk> (raw)
In-Reply-To: <fe88ed4f288c261373d2ad7184f470a8ea19ec42.camel@hellion.org.uk>
[-- Attachment #1: Type: text/plain, Size: 1749 bytes --]
On Sat, 2026-08-22 at 10:35 +0100, Ian Campbell wrote:
> I am looking into what happened, once I've figured it out and fixed it
> I will force push v7.2-rc*-dts and v7.2-dts tags as well as master.
The issue actually occurred between v7.1-rc7 and v7.1 where the rewrite
state tracking file got corrupted (loosing the mappings for every
upstream commit sha starting with b!). As it happens there were no DTS
commits starting b in that window, so v7.1-dts remains unchanged, only
v7.2-rc1-dts onwards had problems.
I've just pushed the updated tags + master.
Updated refs are:
v7.2-rc1-dts: 09832bf2b0b2e0c68573cba8b0fb7a8e44e1f549 -> 607f3ab2da8d12e1f768681837d0148e1434f4f6
v7.2-rc2-dts: 9e215244e26884918782c9f04edbeedc20423900 -> 15747534cdf8337d5fee021aa4460349289163df
v7.2-rc3-dts: 86f4635ad4ec0d3f357dc343abe987cac59a0beb -> 6df412888270fd1e722415f96f9521030ec8a54d
v7.2-rc4-dts: f2fb2d33ea008de172c130de0b42e2a0d7b37239 -> 1fb80695c541c7e4efd067676f14b43af568f33d
v7.2-rc5-dts: 87ccaa2dc91309bb5358d39873f252cea79561ce -> adc5edc9140c341a7c3f46b3230e4ced158cc42b
v7.2-rc6-dts: 7653fa238d797bcfcda9fdf57ab9192fb8f93341 -> 584cbdf196048458bfd6c0b4d997d1aa4020dc08
v7.2-rc7-dts: d8f117c8aee92c4878efd4d17e47d3a1e51e6b89 -> e5f14f4c0501a6d4013513ae2f76f6fa8ae26976
v7.2-dts: f4bde8516d3849987e02e62411e85a6c10c8f239 -> 41930a1eec9ea89c684a8ed95bf8e147f636f10d
master: edd49c1cfb49fd14165e83e33360c789f23ce39e -> 1826bba6fb1c8c0b6d845f8308590dcfd1f7f859
v7.3-rc1-dts will be pushed as normal.
I've added better error handling for failing to save state after a
rewrite iteration as well as a repo size check before pushing.
Thanks to Tom Rini for bringing this problem to my attention.
Cheers,
Ian.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2026-08-23 10:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-22 9:35 devicetree-rebasing history incorrect from v7.2-rc1-dts onwards Ian Campbell
2026-08-23 10:41 ` Ian Campbell [this message]
2026-08-25 13:41 ` Tom Rini
2026-08-25 13:58 ` Ian Campbell
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=c0ef5f140cb5e4e1b953b42c3518a5a432c67a93.camel@hellion.org.uk \
--to=ijc@hellion.org.uk \
--cc=devicetree@vger.kernel.org \
--cc=trini@konsulko.com \
/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