Re: [Qemu-devel] QEMU dtc submodule

[David Gibson]

On Fri, Sep 23, 2016 at 03:23:26PM +0100, Paul Burton wrote:
> On Friday, 23 September 2016 09:13:51 BST Jeff Cody wrote:
> > > Leon: Please give the git URL and branch that should be mirrored.  It
> > > cannot be a tag since that is immutable.  Instead it should be the
> > > dtc development/release tree that will be updated in the future.
> > 
> > Yes, once I get the git URL I'll update it on the server.  I presume it is
> > 'master' on git://git.kernel.org/pub/scm/utils/dtc/dtc.git, but I will wait
> > for confirmation before I do anything.
> > 
> > Thanks,
> > Jeff
> 
> Hi Jeff,
> 
> That would be the right branch for DTC, but sadly the master branch doesn't 
> contain the 
> actual commit that was tagged as the v1.4.2 release. v1.4.2 tags this commit:
> 
> https://git.kernel.org/cgit/utils/dtc/dtc.git/commit/?
> h=v1.4.2&id=ec02b34c05be04f249ffaaca4b666f5246877dea[1] 
> 
> Its parent commit is in the master branch, but it isn't. So simply mirroring 
> the master 
> branch wouldn't be enough, you'd need to include the v1.4.2 tag specifically. 
> I've CC'd David 
> Gibson who tagged DTC v1.4.2 in case he has input or can rectify this (which 
> would 
> probably be either a rebase & force push of the last 2 commits on the master 
> branch atop 
> v1.4.2, or a new release).

Oops.. that's my mistake (with my upstream dtc maintainer hat on).

Not sure quite how I managed that, but yes, master branches off just
before the v1.4.2 release, instead of just after.  I've merged them
back together now, so that master should include v1.4.2 now.

-- 
David Gibson                    | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
                                | _way_ _around_!
http://www.ozlabs.org/~dgibson

signature.asc
Description: PGP signature