ethtool: git tree not updated to v3.18

ethtool: git tree not updated to v3.18

[Jesse Brandeburg]

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.

Re: ethtool: git tree not updated to v3.18

[Daniel Borkmann]

On 04/01/2015 11:30 PM, 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.

Btw, are there any plans to keep track of ethtool patches in
netdev patchwork as well, like we do with iproute2?

I recall in early January this year there was a patch to add
qsfp diag information support to ethtool, but that probably
got lost on the list, not sure.

Cheers,
Daniel

Re: ethtool: git tree not updated to v3.18

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 1612 bytes --]

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.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 811 bytes --]