From: axboe@kernel.dk (Jens Axboe)
Subject: nvme updates for 4.19
Date: Mon, 6 Aug 2018 08:34:02 -0600 [thread overview]
Message-ID: <a679bea1-6732-71bc-c943-778a75ac9e02@kernel.dk> (raw)
In-Reply-To: <20180806073100.GA11515@infradead.org>
On 8/6/18 1:31 AM, Christoph Hellwig wrote:
> On Sun, Aug 05, 2018@08:27:22AM -0600, Jens Axboe wrote:
>> Right, the change is fine, it's just fighting a similar change
>> in a different branch. I did fix it up (picked in the original change
>> first), please double check at your convenience.
>
> The merge looks good. Given that you've changed the head anyway I'd
> also be happy to give you a version of the ANA commit without that
> change..
Let's just leave it as-is for now, I pulled in -rc6 to ensure that I
would resolve the conflict instead of introducing it to Linus.
--
Jens Axboe
prev parent reply other threads:[~2018-08-06 14:34 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-04 8:43 nvme updates for 4.19 Christoph Hellwig
2018-08-04 18:39 ` Jens Axboe
2018-08-05 7:33 ` Christoph Hellwig
2018-08-05 14:27 ` Jens Axboe
2018-08-06 7:31 ` Christoph Hellwig
2018-08-06 14:34 ` Jens Axboe [this message]
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=a679bea1-6732-71bc-c943-778a75ac9e02@kernel.dk \
--to=axboe@kernel.dk \
/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).