* linux-next: bad rebase of the rdma-leon tree
@ 2017-01-04 22:34 Stephen Rothwell
2017-01-05 6:46 ` Leon Romanovsky
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2017-01-04 22:34 UTC (permalink / raw)
To: Leon Romanovsky; +Cc: linux-next, linux-kernel, Philippe Reynes
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.)
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: bad rebase of the rdma-leon tree
2017-01-04 22:34 linux-next: bad rebase of the rdma-leon tree Stephen Rothwell
@ 2017-01-05 6:46 ` Leon Romanovsky
0 siblings, 0 replies; 2+ messages in thread
From: Leon Romanovsky @ 2017-01-05 6:46 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Philippe Reynes
[-- Attachment #1: Type: text/plain, Size: 1353 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-05 6:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-04 22:34 linux-next: bad rebase of the rdma-leon tree Stephen Rothwell
2017-01-05 6:46 ` Leon Romanovsky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).