From: Ian Campbell <ijc@hellion.org.uk>
To: Hector Martin <marcan@marcan.st>
Cc: Rob Herring <robh+dt@kernel.org>,
DTML <devicetree@vger.kernel.org>, Janne Grunau <j@jannau.net>,
Sven Peter <sven@svenpeter.dev>,
Mark Kettenis <mark.kettenis@xs4all.nl>
Subject: Re: Broken devicetree-rebasing history
Date: Fri, 11 Mar 2022 09:01:38 +0000 [thread overview]
Message-ID: <82ba9727b15e99f47488e3b2db4423a51a05bc35.camel@hellion.org.uk> (raw)
In-Reply-To: <9f6a2553-2145-c955-0ece-6c05fa060e50@marcan.st>
Thanks for the heads up, I'll (hopefully) take a look over the weekend.
FYI the state stuff can be found in
https://github.com/ijc/devicetree-conversion-state-v2
Ian.
On Fri, 2022-03-11 at 17:58 +0900, Hector Martin wrote:
> Hi Ian,
>
> I just noticed that at some point in the devicetree-rebasing.git
> history, a merge sneaked in that linked in the mainline git history.
> That unfortunately somewhat defeats the purpose of the repo, since
> you
> can't clone it without cloning all of Linux now.
>
> The last good tag is v5.9-rc2-dts; v5.9-rc3-dts is the first one to
> include the bad merge. With -rc2 you get a 128MB clone; -rc3 ends up
> pulling in 1GB+ from the rest of Linux.
>
> I thought of giving a shot at fixing it myself, but it seems the
> filter
> state/etc branches aren't available on the kernel.org repo, so AIUI
> re-bootstrapping the filtering process would require filtering the
> entire kernel history again, not just the changes since the bad
> merge...
>
> For the Asahi Linux project (Linux on the new Apple machines) we're
> looking into having a dedicated DT repo where we can stage our
> bleeding
> edge changes before they are merged, since we want that to build our
> bootloader+DT packages without pulling in the entire kernel, and I
> was
> thinking of reusing the devicetree-rebasing infra and throwing up a
> cronjob that repeatedly rebases our latest changes from our kernel
> repo
> on top of whatever is the latest version in devicetree-
> rebasing.git...
>
next prev parent reply other threads:[~2022-03-11 9:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-11 8:58 Broken devicetree-rebasing history Hector Martin
2022-03-11 9:01 ` Ian Campbell [this message]
2022-03-13 12:00 ` Ian Campbell
2022-03-14 20:38 ` 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=82ba9727b15e99f47488e3b2db4423a51a05bc35.camel@hellion.org.uk \
--to=ijc@hellion.org.uk \
--cc=devicetree@vger.kernel.org \
--cc=j@jannau.net \
--cc=marcan@marcan.st \
--cc=mark.kettenis@xs4all.nl \
--cc=robh+dt@kernel.org \
--cc=sven@svenpeter.dev \
/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;
as well as URLs for NNTP newsgroup(s).