linux-next: manual merge of the block tree with the l2-mtd tree

Hi Jens, Today's linux-next merge of the block tree got a conflict in drivers/mtd/mtdcore.c between commit 3efe41be224c ("mtd: implement common reboot notifier boilerplate") from the tree and commit b4caecd48005 ("fs: introduce f_op->mmap_capabilities for nommu mmap support") from the block

linux-next: manual merge of the block tree with the l2-mtd tree

Hi Jens, Today's linux-next merge of the block tree got a conflict in drivers/mtd/mtdcore.c between commit 3efe41be224c (mtd: implement common reboot notifier boilerplate) from the tree and commit b4caecd48005 (fs: introduce f_op-mmap_capabilities for nommu mmap support) from the block tree. I

linux-next: manual merge of the block tree with the l2-mtd tree

Hi Jens, Today's linux-next merge of the block tree got a conflict in drivers/mtd/mtdcore.c between commit 3efe41be224c ("mtd: implement common reboot notifier boilerplate") from the tree and commit b4caecd48005 ("fs: introduce f_op->mmap_capabilities for nommu mmap support") from the block

linux-next: manual merge of the block tree with the l2-mtd tree

Hi Jens, Today's linux-next merge of the block tree got a conflict in drivers/mtd/mtdcore.c between commit 3efe41be224c (mtd: implement common reboot notifier boilerplate) from the tree and commit b4caecd48005 (fs: introduce f_op-mmap_capabilities for nommu mmap support) from the block tree. I