From: Christoph Hellwig <hch@infradead.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@infradead.org>,
Keith Busch <keith.busch@intel.com>,
linux-block@vger.kernel.org, Sagi Grimberg <sagi@grimberg.me>,
linux-nvme@lists.infradead.org
Subject: Re: [GIT PULL] nvme update for Linux 4.14
Date: Mon, 28 Aug 2017 08:53:36 -0700 [thread overview]
Message-ID: <20170828155336.GA5302@infradead.org> (raw)
In-Reply-To: <199590da-6ff8-24de-abca-00f23608b93b@kernel.dk>
On Mon, Aug 28, 2017 at 09:51:38AM -0600, Jens Axboe wrote:
> What is this against, exactly? It doesn't merge cleanly with my 4.14 branch.
> >From a quick look, looks like it's conflicting with:
It was based on the nvme-3.13 tree from about two weeks ago,
which was based on your for-linus at about that time.
next prev parent reply other threads:[~2017-08-28 15:53 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-28 14:33 [GIT PULL] nvme update for Linux 4.14 Christoph Hellwig
2017-08-28 15:51 ` Jens Axboe
2017-08-28 15:53 ` Christoph Hellwig [this message]
2017-08-28 15:55 ` Jens Axboe
2017-08-28 15:59 ` Christoph Hellwig
2017-08-28 16:03 ` Jens Axboe
2017-08-28 17:57 ` Christoph Hellwig
2017-08-28 18:05 ` Jens Axboe
2017-08-28 18:40 ` Christoph Hellwig
2017-08-28 19:01 ` Jens Axboe
2017-08-28 19:43 ` Christoph Hellwig
2017-08-28 19:56 ` Sagi Grimberg
2017-08-29 14:34 ` Jens Axboe
2017-08-29 14:50 ` Christoph Hellwig
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=20170828155336.GA5302@infradead.org \
--to=hch@infradead.org \
--cc=axboe@kernel.dk \
--cc=keith.busch@intel.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/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).