]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'v4.18-rc6' into for-4.19/block2
authorJens Axboe <axboe@kernel.dk>
Mon, 6 Aug 2018 01:32:09 +0000 (19:32 -0600)
committerJens Axboe <axboe@kernel.dk>
Mon, 6 Aug 2018 01:32:09 +0000 (19:32 -0600)
commit52c8b1c87ffedcdf96724b1b8bf6e68257276260
tree12b0f4e41c1491fe5087480d9c47e61aff8a1d33
parent482a5e15917d8f31656b0180d71d179c7318b00c
parentbeb4ed450cde99e7dfbc41549d25fa2ff039b2d9
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>
block/bsg.c
drivers/ata/libata-scsi.c
drivers/nvme/host/core.c
drivers/nvme/host/pci.c
kernel/fork.c
mm/huge_memory.c
mm/memcontrol.c