devicetree-rebasing: master branch and tags have been rebased

devicetree-rebasing: master branch and tags have been rebased

[Ian Campbell]

Hi all,

TL;DR: 

   https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git
   master branch has been rebased and tags v5.9-rc2-dts..v5.17-rc7-dts
   (inclusive) have been recreated.
   
   You will need to reclone or force things to take the new versions,
   including `git fetch --tags --force`

Longer version:

Between v5.9-rc2-dts and v5.9-rc3-dts somehow a merge crept into the
conversion process which grafted the real linux.git history into the
tree, meaning clones were >1GB instead of <100MB.

The conversion process has been rerun from v5.9-rc1 and the tags from
(and including) v5.9-rc2-dts have been recreated, up to v5.17-rc7-dts.

This means that when updating your existing clones will likely need to
forcibly reset to the new master branch since it is not a fast-forward
and you will want to `get fetch --tags --force` as well.

The GH mirror is now https://github.com/ijc/devicetree-rebasing-v3 and
v2 will no longer be updated. Likewise the conversion state repo is now
https://github.com/ijc/devicetree-conversion-state-v3

v5.17-rc8-dts will be pushed from the new history only.

Many thanks to Hector for bringing this to my attention.

Cheers,
Ian.

Re: devicetree-rebasing: master branch and tags have been rebased

[Ian Campbell]

On Mon, 2022-03-14 at 20:35 +0000, Ian Campbell wrote:
> Hi all,
> 
> TL;DR: 
> 
>    https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git
>    master branch has been rebased and tags v5.9-rc2-dts..v5.17-rc7-dts
>    (inclusive) have been recreated.
>    
>    You will need to reclone or force things to take the new versions,
>    including `git fetch --tags --force`

Unfortunately v5.9-dts itself was missed, so the clones didn't get any
smaller and the v5.9-dts tag was disjoint from the new history.

Sadly there was an actual relevant change between v5.9-rc8 and v5.9 so
I couldn't just shift the tag to the existing correct merge point in
the dts master branch.

So... I've had to force master and all the tags v5.9-rc2-dts..v5.17-
rc8-dts (note: v5.17-rc8 now included) as second time.

The two github repos have also been updated this time rather than going
to v4.

Just the -dts tags and the sequence of merges onto the master branch
have changed, not the actual converted commits.

Apologies for the faff.

Ian.
> 
> Longer version:
> 
> Between v5.9-rc2-dts and v5.9-rc3-dts somehow a merge crept into the
> conversion process which grafted the real linux.git history into the
> tree, meaning clones were >1GB instead of <100MB.
> 
> The conversion process has been rerun from v5.9-rc1 and the tags from
> (and including) v5.9-rc2-dts have been recreated, up to v5.17-rc7-
> dts.
> 
> This means that when updating your existing clones will likely need
> to
> forcibly reset to the new master branch since it is not a fast-
> forward
> and you will want to `get fetch --tags --force` as well.
> 
> The GH mirror is now
> https://github.com/ijc/devicetree-rebasing-v3 and
> v2 will no longer be updated. Likewise the conversion state repo is
> now
> https://github.com/ijc/devicetree-conversion-state-v3
> 
> v5.17-rc8-dts will be pushed from the new history only.
> 
> Many thanks to Hector for bringing this to my attention.
> 
> Cheers,
> Ian.