From: Jens Axboe Date: Mon, 6 Aug 2018 01:32:09 +0000 (-0600) Subject: Merge tag 'v4.18-rc6' into for-4.19/block2 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=05b9ba4b550ff67d7362608828405f9e389e8988;p=linux.git Merge tag 'v4.18-rc6' into for-4.19/block2 Pull in 4.18-rc6 to get the NVMe core AEN change to avoid a merge conflict down the line. Signed-of-by: Jens Axboe --- 05b9ba4b550ff67d7362608828405f9e389e8988