git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 704f839 d72e90f)

author	Jens Axboe <axboe@kernel.dk>
	Mon, 6 Aug 2018 01:32:09 +0000 (19:32 -0600)
committer	Jens Axboe <axboe@kernel.dk>
	Mon, 6 Aug 2018 01:32:09 +0000 (19:32 -0600)
commit	05b9ba4b550ff67d7362608828405f9e389e8988
tree	12b0f4e41c1491fe5087480d9c47e61aff8a1d33	tree \| snapshot
parent	704f83928c8e7da6e06144569efb15dec73278e8	commit \| diff
parent	d72e90f33aa4709ebecc5005562f52335e106a60	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
drivers/ata/libata-scsi.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/core.c	diff1 \|	diff2 \|	blob \| history
drivers/nvme/host/pci.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
mm/huge_memory.c	diff1 \|	diff2 \|	blob \| history
mm/memcontrol.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree