[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <1427998993.28415.5.camel@decadent.org.uk>
Date: Thu, 02 Apr 2015 19:23:13 +0100
From: Ben Hutchings <ben@...adent.org.uk>
To: Jesse Brandeburg <jesse.brandeburg@...el.com>
Cc: netdev@...r.kernel.org
Subject: Re: ethtool: git tree not updated to v3.18
On Wed, 2015-04-01 at 14:30 -0700, Jesse Brandeburg wrote:
> Hi Ben,
>
> When trying to check a bug just now I noticed that the master
> branch of
> git://git.kernel.org/pub/scm/network/ethtool/ethtool
>
> still points to the v3.16 tag.
>
> But kernel.org shows version 3.18 released. I did some quick
> investigation and it looks like the v3.18 tag points to a dangling
> commit that is not on a branch.
>
> $ git log --graph --oneline v3.18 |head -n5
> * ba9a11a Release version 3.18.
> * 1e8811a Fix build with musl by using more common typedefs
> * 99bc878 bug fix: SFP Tx BIAS uses memory wrong offset
> * 4614098 Release version 3.16.
> * 14ef76c test-cmdline: Disable test cases for --rxfh hash key parsing
>
> $ git log --graph --oneline origin/master |head -n5
> * 4614098 Release version 3.16.
> * 14ef76c test-cmdline: Disable test cases for --rxfh hash key parsing
> * 86c0326 ethtool: Support for configurable RSS hash key
> * e633626 ethtool-copy.h: sync with net
> * 05b8ad5 Release version 3.14.
>
> Maybe you can merge the commits from your working branch back onto
> master and make another 3.18.1 tag or something.
>
> I just did:
> git checkout master
> git merge v3.18
>
> which worked okay, I think
Sorry about that, I pushed the tag but not the master branch when
releasing 3.18. This should be fixed now.
There's a long weekend coming up, and I hope to get to the submitted
patches and make a 4.0 release then.
Ben.
--
Ben Hutchings
Lowery's Law:
If it jams, force it. If it breaks, it needed replacing anyway.
Download attachment "signature.asc" of type "application/pgp-signature" (812 bytes)
Powered by blists - more mailing lists