On Fri, Sep 8, 2017 at 10:34 AM, Jens Axboe <axboe@xxxxxxxxx> 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 Your earlier merge for mm/page_io.c is ugly, and mixes up the bi_disk thing oddly in the middle of the task struct code. Other than that, we match. Linus
