On 09/08/2017 11:34 AM, Jens Axboe wrote: > Single merge conflict here, for nvme/rdma. Trivial to fixup, see my > for-next branch here: > > http://git.kernel.dk/cgit/linux-block/log/?h=for-next > > if you want to see how I resolved it. Note that the for-next branch is > missing one late bcache fixup, so it's not identical to what you will > end up with after pulling this in. Actually, I misspoke, I did pull in that last change yesterday. So it's all merged up. -- Jens Axboe
