nvme updates for 4.19

[axboe@kernel.dk (Jens Axboe)]

On 8/5/18 1:33 AM, Christoph Hellwig wrote:
> 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).

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.

-- 
Jens Axboe