From linux-mtd at lists.infradead.org  Mon Jul  6 13:59:01 2015
From: linux-mtd at lists.infradead.org (Linux-MTD Mailing List)
Date: Mon, 06 Jul 2015 20:59:01 +0000
Subject: MAINTAINERS: mtd: docg3: add docg3 maintainer
Message-ID: <E1ZCDTh-0003xR-5k@bombadil.infradead.org>

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=159eeea4cbc142bd5fd396a84cc63345455586a6
Commit:     159eeea4cbc142bd5fd396a84cc63345455586a6
Parent:     d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754
Author:     Robert Jarzmik <robert.jarzmik at free.fr>
AuthorDate: Thu Jun 25 19:14:18 2015 +0200
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Mon Jul 6 13:49:25 2015 -0700

    MAINTAINERS: mtd: docg3: add docg3 maintainer
    
    Add myself as maintainer of the NAND based MSystems DiskOnChip G3
    driver.
    
    Signed-off-by: Robert Jarzmik <robert.jarzmik at free.fr>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 MAINTAINERS | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 8133cef..9567329 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6824,6 +6824,12 @@ T:	git git://linuxtv.org/anttip/media_tree.git
 S:	Maintained
 F:	drivers/media/usb/msi2500/
 
+MSYSTEMS DISKONCHIP G3 MTD DRIVER
+M:	Robert Jarzmik <robert.jarzmik at free.fr>
+L:	linux-mtd at lists.infradead.org
+S:	Maintained
+F:	drivers/mtd/devices/docg3*
+
 MT9M032 APTINA SENSOR DRIVER
 M:	Laurent Pinchart <laurent.pinchart at ideasonboard.com>
 L:	linux-media at vger.kernel.org


From linux-mtd at lists.infradead.org  Tue Jul  7 13:59:01 2015
From: linux-mtd at lists.infradead.org (Linux-MTD Mailing List)
Date: Tue, 07 Jul 2015 20:59:01 +0000
Subject: mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict
Message-ID: <E1ZCZxF-000155-Dy@bombadil.infradead.org>

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=5f867db63473f32cce1b868e281ebd42a41f8fad
Commit:     5f867db63473f32cce1b868e281ebd42a41f8fad
Parent:     159eeea4cbc142bd5fd396a84cc63345455586a6
Author:     Scott Wood <scottwood at freescale.com>
AuthorDate: Fri Jun 26 19:43:58 2015 -0500
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Tue Jul 7 13:03:25 2015 -0700

    mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict
    
    Commit 66507c7bc8895f0da6b ("mtd: nand: Add support to use nand_base
    poi databuf as bounce buffer") added a flag NAND_USE_BOUNCE_BUFFER
    using the same bit value as the existing NAND_BUSWIDTH_AUTO.
    
    Cc: Kamal Dasu <kdasu.kdev at gmail.com>
    Fixes: 66507c7bc8895f0da6b ("mtd: nand: Add support to use nand_base
    	poi databuf as bounce buffer")
    Signed-off-by: Scott Wood <scottwood at freescale.com>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 include/linux/mtd/nand.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index f25e2bd..272f429 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -178,17 +178,17 @@ typedef enum {
 /* Chip may not exist, so silence any errors in scan */
 #define NAND_SCAN_SILENT_NODEV	0x00040000
 /*
- * This option could be defined by controller drivers to protect against
- * kmap'ed, vmalloc'ed highmem buffers being passed from upper layers
- */
-#define NAND_USE_BOUNCE_BUFFER	0x00080000
-/*
  * Autodetect nand buswidth with readid/onfi.
  * This suppose the driver will configure the hardware in 8 bits mode
  * when calling nand_scan_ident, and update its configuration
  * before calling nand_scan_tail.
  */
 #define NAND_BUSWIDTH_AUTO      0x00080000
+/*
+ * This option could be defined by controller drivers to protect against
+ * kmap'ed, vmalloc'ed highmem buffers being passed from upper layers
+ */
+#define NAND_USE_BOUNCE_BUFFER	0x00100000
 
 /* Options set by nand scan */
 /* Nand scan has allocated controller struct */


