Linux-NVME Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: hch@infradead.org (Christoph Hellwig)
Subject: nvme updates for 4.19
Date: Sun, 5 Aug 2018 00:33:05 -0700	[thread overview]
Message-ID: <20180805073305.GA31663@infradead.org> (raw)
In-Reply-To: <df1c976e-8ea7-ba14-d1d2-caf8511de527@kernel.dk>

On Sat, Aug 04, 2018@12:39:13PM -0600, Jens Axboe wrote:
> On 8/4/18 2:43 AM, Christoph Hellwig wrote:
> This one:
> 
> > Christoph Hellwig (9):
> >       nvme: add ANA support
> 
> Has a stupid conflict with:
> 
> commit fa441b71aa27d06fa79d5e7f7c329981dccd94d1
> Author: Weiping Zhang <zhangweiping at didichuxing.com>
> Date:   Tue Jul 3 00:34:38 2018 +0800
> 
>     nvme: don't enable AEN if not supported
> 
> from mainline. Please keep changes like that in mind, that change should
> never have been in the "nvme: add ANA support" patch.

The addition of the supported bit is because the released version
of the ANA spec was buggy and didn't add the supported bit to the
oaes field.  This hasn't been fixed in an erratate and I dropped
the manual addition of the support, but I failed to remove the
local supported variable (which modulo the conflict actually makes
sense, but should indeed not have been part of the commit).

  reply	other threads:[~2018-08-05  7:33 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 [this message]
2018-08-05 14:27     ` Jens Axboe
2018-08-06  7:31       ` Christoph Hellwig
2018-08-06 14:34         ` 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=20180805073305.GA31663@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