All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jens Axboe <axboe@kernel.dk>
To: Christoph Hellwig <hch@infradead.org>
Cc: Keith Busch <keith.busch@intel.com>,
	Sagi Grimberg <sagi@grimberg.me>,
	linux-nvme@lists.infradead.org, linux-block@vger.kernel.org
Subject: Re: [GIT PULL] nvme update for Linux 4.14
Date: Mon, 28 Aug 2017 09:51:38 -0600	[thread overview]
Message-ID: <199590da-6ff8-24de-abca-00f23608b93b@kernel.dk> (raw)
In-Reply-To: <20170828143343.evhchzfzam3whgwm@infradead.org>

On 08/28/2017 08:33 AM, Christoph Hellwig wrote:
> Hi Jens,
> 
> below is the current set of NVMe updates for Linux 4.14.
> 
> The biggest bit comes from Sagi and refactors the RDMA driver to prepare
> for more code sharing in the setup and teardown path.  But we have various
> features and bug fixes from a lot of people as well.
> 
> The following changes since commit 16a5a480f067f945fd27bf91ffdce3f959b0d4b6:
> 
>   nvmet-fc: correct use after free on list teardown (2017-08-16 10:06:18 +0200)
> 
> are available in the git repository at:
> 
>   git://git.infradead.org/nvme.git nvme-4.14
> 
> for you to fetch changes up to 16edd3d0272368eee5cac13356787c1f4d4eb255:
> 
>   nvme: honor RTD3 Entry Latency for shutdowns (2017-08-28 16:29:29 +0200)

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:

commit d09f2b45f346f0a9e5e1b5fcea531b1b393671dc
Author: Sagi Grimberg <sagi@grimberg.me>
Date:   Sun Jul 2 10:56:43 2017 +0300

    nvme: split nvme_uninit_ctrl into stop and uninit

which went into master after for-4.14/block was forked off. I can fix it
up, but would be best if you did it.

-- 
Jens Axboe

WARNING: multiple messages have this Message-ID (diff)
From: axboe@kernel.dk (Jens Axboe)
Subject: [GIT PULL] nvme update for Linux 4.14
Date: Mon, 28 Aug 2017 09:51:38 -0600	[thread overview]
Message-ID: <199590da-6ff8-24de-abca-00f23608b93b@kernel.dk> (raw)
In-Reply-To: <20170828143343.evhchzfzam3whgwm@infradead.org>

On 08/28/2017 08:33 AM, Christoph Hellwig wrote:
> Hi Jens,
> 
> below is the current set of NVMe updates for Linux 4.14.
> 
> The biggest bit comes from Sagi and refactors the RDMA driver to prepare
> for more code sharing in the setup and teardown path.  But we have various
> features and bug fixes from a lot of people as well.
> 
> The following changes since commit 16a5a480f067f945fd27bf91ffdce3f959b0d4b6:
> 
>   nvmet-fc: correct use after free on list teardown (2017-08-16 10:06:18 +0200)
> 
> are available in the git repository at:
> 
>   git://git.infradead.org/nvme.git nvme-4.14
> 
> for you to fetch changes up to 16edd3d0272368eee5cac13356787c1f4d4eb255:
> 
>   nvme: honor RTD3 Entry Latency for shutdowns (2017-08-28 16:29:29 +0200)

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:

commit d09f2b45f346f0a9e5e1b5fcea531b1b393671dc
Author: Sagi Grimberg <sagi at grimberg.me>
Date:   Sun Jul 2 10:56:43 2017 +0300

    nvme: split nvme_uninit_ctrl into stop and uninit

which went into master after for-4.14/block was forked off. I can fix it
up, but would be best if you did it.

-- 
Jens Axboe

  reply	other threads:[~2017-08-28 15:51 UTC|newest]

Thread overview: 28+ 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 14:33 ` Christoph Hellwig
2017-08-28 15:51 ` Jens Axboe [this message]
2017-08-28 15:51   ` Jens Axboe
2017-08-28 15:53   ` Christoph Hellwig
2017-08-28 15:53     ` Christoph Hellwig
2017-08-28 15:55     ` Jens Axboe
2017-08-28 15:55       ` Jens Axboe
2017-08-28 15:59       ` Christoph Hellwig
2017-08-28 15:59         ` Christoph Hellwig
2017-08-28 16:03         ` Jens Axboe
2017-08-28 16:03           ` Jens Axboe
2017-08-28 17:57           ` Christoph Hellwig
2017-08-28 17:57             ` Christoph Hellwig
2017-08-28 18:05             ` Jens Axboe
2017-08-28 18:05               ` Jens Axboe
2017-08-28 18:40               ` Christoph Hellwig
2017-08-28 18:40                 ` Christoph Hellwig
2017-08-28 19:01                 ` Jens Axboe
2017-08-28 19:01                   ` Jens Axboe
2017-08-28 19:43                   ` Christoph Hellwig
2017-08-28 19:43                     ` Christoph Hellwig
2017-08-28 19:56                     ` Sagi Grimberg
2017-08-28 19:56                       ` Sagi Grimberg
2017-08-29 14:34                       ` Jens Axboe
2017-08-29 14:34                         ` Jens Axboe
2017-08-29 14:50                         ` Christoph Hellwig
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=199590da-6ff8-24de-abca-00f23608b93b@kernel.dk \
    --to=axboe@kernel.dk \
    --cc=hch@infradead.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.