Linux-NVME Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: hch@infradead.org (Christoph Hellwig)
Subject: [GIT PULL] nvme updates for 4.12
Date: Thu, 27 Apr 2017 10:38:26 -0700	[thread overview]
Message-ID: <20170427173826.GA26927@infradead.org> (raw)
In-Reply-To: <0d1264ff-a8b6-7df5-6d8a-572525275e0c@kernel.dk>

On Thu, Apr 27, 2017@11:36:00AM -0600, Jens Axboe wrote:
> Pulled, but it threw two merge issues that I fixed up. Please double
> check them.

I saw issues vs for-next, but not vs for-4.12/block, which I assumed
was ok.

> It's queued up in the for-4.12/post-merge branch because of these
> conflicts with master.

Ok, I've got another pile that will sit on top of this..

  reply	other threads:[~2017-04-27 17:38 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-27 17:19 [GIT PULL] nvme updates for 4.12 Christoph Hellwig
2017-04-27 17:36 ` Jens Axboe
2017-04-27 17:38   ` Christoph Hellwig [this message]
2017-04-27 17:41     ` Jens Axboe
  -- strict thread matches above, loose matches on Subject: below --
2017-04-21 17:02 Christoph Hellwig
2017-04-21 17:15 ` 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=20170427173826.GA26927@infradead.org \
    --to=hch@infradead.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