]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 5575f71 8f7e382)
Merge tag 'v4.1.12-70#22913653a12' into pmem-4.1-merge
authorDan Duval <dan.duval@oracle.com>
Fri, 23 Dec 2016 18:32:49 +0000 (13:32 -0500)
committerDan Duval <dan.duval@oracle.com>
Fri, 23 Dec 2016 18:32:49 +0000 (13:32 -0500)
commitc311ca8a3d9349dfc606cada0d8ca14e58728c9c
tree92b83a770b23ef0fc9200d3e0537492c79927a4ftree
parent5575f71a98ee397c34506afc1e66f5562cb23b8dcommit | diff
parent8f7e3821f4b37232d1006b73dcf4bf4d40a1d1e8commit | diff
Merge tag 'v4.1.12-70#22913653a12' into pmem-4.1-merge

OLdev tag v4.1.12-70#22913653a12

Signed-off-by: Dan Duval <dan.duval@oracle.com>
Conflicts:

block/blk-mq-sysfs.c
block/blk-mq.c

Additional edit needed:

fs/xfs/xfs_aops.c
arch/sparc/include/asm/pgtable_64.h diff1 | diff2 | blob | history
block/blk-core.c diff1 | diff2 | blob | history
block/blk-mq.c diff1 | diff2 | blob | history
fs/xfs/xfs_aops.c diff1 | diff2 | blob | history
include/linux/blkdev.h diff1 | diff2 | blob | history
include/linux/device.h diff1 | diff2 | blob | history
include/linux/mm.h diff1 | diff2 | blob | history
mm/migrate.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.