From: Jens Axboe <axboe@kernel.dk>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: "linux-block@vger.kernel.org" <linux-block@vger.kernel.org>
Subject: Re: [GIT PULL] Followup block pull request for 4.14-rc1
Date: Fri, 8 Sep 2017 11:55:40 -0600 [thread overview]
Message-ID: <bb8b83d5-3e38-5445-9ba4-a2627e161cf0@kernel.dk> (raw)
In-Reply-To: <1f069ba0-19bf-a7b3-3a65-78f7f20ddc65@kernel.dk>
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
next prev parent reply other threads:[~2017-09-08 17:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-08 17:34 [GIT PULL] Followup block pull request for 4.14-rc1 Jens Axboe
2017-09-08 17:55 ` Jens Axboe [this message]
2017-09-09 19:54 ` Linus Torvalds
2017-09-09 20:00 ` Linus Torvalds
2017-09-10 4:07 ` Jens Axboe
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=bb8b83d5-3e38-5445-9ba4-a2627e161cf0@kernel.dk \
--to=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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;
as well as URLs for NNTP newsgroup(s).