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 <[email protected]> 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. -- Jens Axboe
