lkml.org 
[lkml]   [2017]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: bad rebase of the rdma-leon tree
On Thu, Jan 05, 2017 at 09:34:53AM +1100, Stephen Rothwell wrote:
> Hi Leon,
>
> In rebasing the rdma-leon tree, you have cherry-picked several patches
> that were in the net-next tree:
>
> Commit 8e4881aa == 90af6fea net: mdio: add mdio45_ethtool_ksettings_get
> Commit e938ed15 == 9aee5260 net: sfc: falcon: use new api ethtool_{get|set}_link_ksettings
> Commit 41a65f70 == fae73a50 net: dec: de2104x: use new api ethtool_{get|set}_link_ksettings
> Commit 6711a87a == acbf8e3c net: dec: uli526x: use new api ethtool_{get|set}_link_ksettings
> Commit 453e5f3d == edffccbc net: dec: winbond-840: use new api ethtool_{get|set}_link_ksettings
> Commit 90222550 == 8c2863a7 net: dlink: dl2k: use new api ethtool_{get|set}_link_ksettings
> Commit 88c513d4 == c9abb356 net: dlink: sundance: use new api ethtool_{get|set}_link_ksettings
> Commit fd90095d == ba141e8e net: emulex: benet: use new api ethtool_{get|set}_link_ksettings
> Commit 9da12b64 == 4c8dff9c net: faraday: ftmac100: use new api ethtool_{get|set}_link_ksettings
> Commit 0a0a8d6b == 98192246 net: fealnx: use new api ethtool_{get|set}_link_ksettings
>
> (The first SHA1s above are in the net-next tree.)

Thanks Stephen,
I'm sorry for the mess that I produced in last days with my branches.
It seems that I did git rebase instead of git reset.
>
> --
> Cheers,
> Stephen Rothwell
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2017-01-05 07:51    [W:1.284 / U:0.516 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site