On 8/6/18 1:31 AM, Christoph Hellwig wrote: > On Sun, Aug 05, 2018 at 08:27:22AM -0600, Jens Axboe wrote: >> 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. > > The merge looks good. Given that you've changed the head anyway I'd > also be happy to give you a version of the ANA commit without that > change..
Let's just leave it as-is for now, I pulled in -rc6 to ensure that I would resolve the conflict instead of introducing it to Linus. -- Jens Axboe
