From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Leon Romanovsky <leon@kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Philippe Reynes <tremyfr@gmail.com>
Subject: linux-next: bad rebase of the rdma-leon tree
Date: Thu, 5 Jan 2017 09:34:53 +1100 [thread overview]
Message-ID: <20170105093453.71ff8281@canb.auug.org.au> (raw)
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
next reply other threads:[~2017-01-04 22:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-04 22:34 Stephen Rothwell [this message]
2017-01-05 6:46 ` linux-next: bad rebase of the rdma-leon tree Leon Romanovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170105093453.71ff8281@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=leon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tremyfr@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox