Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/rocker/rocker.c

The rocker commit was two overlapping changes, one to rename
the ->vport member to ->pport, and another making the bitmask
expression use '1ULL' instead of plain '1'.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 28 insertions, 0 deletions

diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 0ec4d6ea1e4b..11883bd26d9d 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -37,6 +37,7 @@
 #include <linux/backing-dev.h>
 #include <linux/gfp.h>
 #include <linux/slab.h>
+#include <linux/reboot.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
@@ -356,6 +357,17 @@ unsigned mtd_mmap_capabilities(struct mtd_info *mtd)
 EXPORT_SYMBOL_GPL(mtd_mmap_capabilities);
 #endif
 
+static int mtd_reboot_notifier(struct notifier_block *n, unsigned long state,
+                               void *cmd)
+{
+        struct mtd_info *mtd;
+
+        mtd = container_of(n, struct mtd_info, reboot_notifier);
+        mtd->_reboot(mtd);
+
+        return NOTIFY_DONE;
+}
+
 /**
  *      add_mtd_device - register an MTD device
  *      @mtd: pointer to new MTD device info structure
@@ -544,6 +556,19 @@ int mtd_device_parse_register(struct mtd_info *mtd, const char * const *types,
                         err = -ENODEV;
         }
 
+        /*
+         * FIXME: some drivers unfortunately call this function more than once.
+         * So we have to check if we've already assigned the reboot notifier.
+         *
+         * Generally, we can make multiple calls work for most cases, but it
+         * does cause problems with parse_mtd_partitions() above (e.g.,
+         * cmdlineparts will register partitions more than once).
+         */
+        if (mtd->_reboot && !mtd->reboot_notifier.notifier_call) {
+                mtd->reboot_notifier.notifier_call = mtd_reboot_notifier;
+                register_reboot_notifier(&mtd->reboot_notifier);
+        }
+
         return err;
 }
 EXPORT_SYMBOL_GPL(mtd_device_parse_register);
@@ -558,6 +583,9 @@ int mtd_device_unregister(struct mtd_info *master)
 {
         int err;
 
+        if (master->_reboot)
+                unregister_reboot_notifier(&master->reboot_notifier);
+
         err = del_mtd_partitions(master);
         if (err)
                 return err;