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 <axboe@kernel.dk>

diff --cc block/bsg.c
Simple merge

diff --cc drivers/ata/libata-scsi.c
Simple merge

diff --cc drivers/nvme/host/core.c
Simple merge

diff --cc drivers/nvme/host/pci.c
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc mm/huge_memory.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge