Jens Axboe 8f66439eec Merge tag 'v4.12-rc5' into for-4.13/block ...

We've already got a few conflicts and upcoming work depends on some of the
changes that have gone into mainline as regression fixes for this series.

Pull in 4.12-rc5 to resolve these conflicts and make it easier on down stream
trees to continue working on 4.13 changes.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

2017-06-12 08:30:13 -06:00

..

chips

drivers/mtd: Convert remaining uses of pr_warning to pr_warn

2017-04-19 13:10:54 -07:00

devices

Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

2017-02-28 11:50:53 -08:00

lpddr

mtd: lpddr: show parent device in sysfs

2015-10-13 09:21:17 -07:00

maps

mtd: physmap_of: use OF helpers for reading strings

2017-04-19 15:26:26 -07:00

nand

mtd: nand: make nand_ooblayout_lp_hamming_ops static

2017-05-22 09:42:29 +02:00

onenand

mtd: silence some uninitialized variable warnings

2016-07-09 18:14:39 -07:00

spi-nor

Merge tag 'for-linus-20170510' of git://git.infradead.org/linux-mtd

2017-05-11 10:44:22 -07:00

tests

sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>

2017-03-02 08:42:32 +01:00

ubi

blk-mq: switch ->queue_rq return value to blk_status_t

2017-06-09 09:27:32 -06:00

afs.c

mtd: partitions: make parsers return 'const' partition arrays

2015-12-09 10:21:57 -08:00

ar7part.c

mtd: partitions: make parsers return 'const' partition arrays

2015-12-09 10:21:57 -08:00

bcm47xxpart.c

mtd: bcm47xxpart: support layouts with multiple TRX partitions

2017-02-09 18:59:45 -08:00

bcm63xxpart.c

mtd: bcm63xxpart: give width specifier an 'int', not 'size_t'

2016-03-07 13:13:58 -08:00

cmdlinepart.c

mtd: partitions: make parsers return 'const' partition arrays

2015-12-09 10:21:57 -08:00

ftl.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

inftlcore.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

inftlmount.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

Kconfig

mtd: bcm63xxpart: Remove dependency on mach-bcm63xx

2016-02-12 10:27:48 -08:00

Makefile

mtd: spi-nor: shorten Kconfig naming

2014-04-14 11:23:01 -07:00

mtd_blkdevs.c

block: introduce new block status code type

2017-06-09 09:27:32 -06:00

mtdblock_ro.c

mtd: Move major number definitions to major.h

2013-11-06 23:32:59 -08:00

mtdblock.c

mtd: mtdblock: remove the needless mtdblks_lock

2015-01-07 12:51:56 -08:00

mtdchar.c

mtd: Fix typo: "occured" -> "occurred"

2017-02-08 14:24:57 -08:00

mtdconcat.c

mtd: create an mtd_ooblayout_ops struct to ease ECC layout definition

2016-04-19 22:05:55 +02:00

mtdcore.c

bdi: Drop 'parent' argument from bdi_register[_va]()

2017-04-20 12:09:55 -06:00

mtdcore.h

mtd: partitions: support a cleanup callback for parsers

2015-12-09 14:57:44 -08:00

mtdoops.c

mtdoops: don't erase flash at each boot

2012-11-15 15:37:51 +02:00

mtdpart.c

mtd: Add partition device node to mtd partition devices

2017-02-09 19:19:25 -08:00

mtdsuper.c

fs: Remove SB_I_DYNBDI flag

2017-04-20 12:09:55 -06:00

mtdswap.c

mtd: mtdswap: use MTDSWAP_ECNT_MIN/MAX

2017-04-19 13:12:02 -07:00

nftlcore.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

nftlmount.c

mtd: nftl: reorganize operations in condition check

2015-01-09 15:26:29 -08:00

ofpart.c

drivers/mtd: Convert remaining uses of pr_warning to pr_warn

2017-04-19 13:10:54 -07:00

redboot.c

mtd: partitions: make parsers return 'const' partition arrays

2015-12-09 10:21:57 -08:00

rfd_ftl.c

mtd: remove some duplicative checks

2014-03-10 22:42:25 -07:00

sm_ftl.c

treewide: Fix typos in printk

2016-04-18 11:23:24 +02:00

sm_ftl.h

…

ssfdc.c

mtd: Replace if and BUG with BUG_ON

2016-07-09 18:48:54 -07:00