linux-next: manual merge of the mtd tree with Linus' tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]


Hi David,

Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/mtdcore.c between commit
a33eb6b91034c95b9b08576f68be170f995b2c7d ("Move mtd_bdi_*mappable to
mtdcore.c") from Linus' tree and commit
b520e412faaaad35641aeedd6059179f9f1b393c ("mtd: Replace static array of
devices with an idr structure") from the mtd tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/mtd/mtdcore.c
index b177e75,70a7858..0000000
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@@ -19,39 -17,12 +19,40 @@@
  #include <linux/init.h>
  #include <linux/mtd/compatmac.h>
  #include <linux/proc_fs.h>
 +#include <linux/backing-dev.h>
+ #include <linux/idr.h>
  
  #include <linux/mtd/mtd.h>
 -#include "internal.h"
  
  #include "mtdcore.h"
 +/*
 + * backing device capabilities for non-mappable devices (such as NAND flash)
 + * - permits private mappings, copies are taken of the data
 + */
 +struct backing_dev_info mtd_bdi_unmappable = {
 +	.capabilities	= BDI_CAP_MAP_COPY,
 +};
 +
 +/*
 + * backing device capabilities for R/O mappable devices (such as ROM)
 + * - permits private mappings, copies are taken of the data
 + * - permits non-writable shared mappings
 + */
 +struct backing_dev_info mtd_bdi_ro_mappable = {
 +	.capabilities	= (BDI_CAP_MAP_COPY | BDI_CAP_MAP_DIRECT |
 +			   BDI_CAP_EXEC_MAP | BDI_CAP_READ_MAP),
 +};
 +
 +/*
 + * backing device capabilities for writable mappable devices (such as RAM)
 + * - permits private mappings, copies are taken of the data
 + * - permits non-writable shared mappings
 + */
 +struct backing_dev_info mtd_bdi_rw_mappable = {
 +	.capabilities	= (BDI_CAP_MAP_COPY | BDI_CAP_MAP_DIRECT |
 +			   BDI_CAP_EXEC_MAP | BDI_CAP_READ_MAP |
 +			   BDI_CAP_WRITE_MAP),
 +};
  
  static int mtd_cls_suspend(struct device *dev, pm_message_t state);
  static int mtd_cls_resume(struct device *dev);
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Photo]     [Yosemite News]    [Yosemite Photos]    [Free Online Dating]     [Linux Kernel]     [Linux SCSI]     [XFree86]

Add to Google Powered by Linux