This is a note to let you know that I've just added the patch titled

    Partially revert "mtd: nand: pxa3xx: Introduce 'marvell,armada370-nand' 
compatible string"

to the 3.12-stable tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     
partially-revert-mtd-nand-pxa3xx-introduce-marvell-armada370-nand-compatible-string.patch
and it can be found in the queue-3.12 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.


>From 9c59ac616137fb62f6cb3f1219201b09cbcf30be Mon Sep 17 00:00:00 2001
From: Ezequiel Garcia <[email protected]>
Date: Mon, 9 Dec 2013 18:36:26 -0300
Subject: Partially revert "mtd: nand: pxa3xx: Introduce 
'marvell,armada370-nand' compatible string"

From: Ezequiel Garcia <[email protected]>

commit 9c59ac616137fb62f6cb3f1219201b09cbcf30be upstream.

This partially reverts c0f3b8643a6fa2461d70760ec49d21d2b031d611.

The "armada370-nand" compatible support is not complete, and it was mistake
to add it. Revert it and postpone the support until the infrastructure is
in place.

Signed-off-by: Ezequiel Garcia <[email protected]>
Acked-by: Jason Cooper <[email protected]>
Signed-off-by: Brian Norris <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/mtd/nand/pxa3xx_nand.c |    4 ----
 1 file changed, 4 deletions(-)

--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -1241,10 +1241,6 @@ static struct of_device_id pxa3xx_nand_d
                .compatible = "marvell,pxa3xx-nand",
                .data       = (void *)PXA3XX_NAND_VARIANT_PXA,
        },
-       {
-               .compatible = "marvell,armada370-nand",
-               .data       = (void *)PXA3XX_NAND_VARIANT_ARMADA370,
-       },
        {}
 };
 MODULE_DEVICE_TABLE(of, pxa3xx_nand_dt_ids);


Patches currently in stable-queue which might be from 
[email protected] are

queue-3.12/partially-revert-mtd-nand-pxa3xx-introduce-marvell-armada370-nand-compatible-string.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to