Re: linux-next: manual merge of the arm-soc tree with the l2-mtd tree

2013-07-02 Thread Artem Bityutskiy
On Tue, 2013-07-02 at 06:18 +, Gupta, Pekon wrote: > You may drop this patch if you wish so, but its not correct to say that this > was not reviewed. Following are comments from "Arnd Bergmann" > http://lists.infradead.org/pipermail/linux-mtd/2013-May/047030.html > And follow-up reasoning.. > h

Re: linux-next: manual merge of the arm-soc tree with the l2-mtd tree

2013-07-02 Thread Artem Bityutskiy
On Mon, 2013-07-01 at 23:00 -0700, Olof Johansson wrote: > It was also applied today, after the merge window opened. Don't merge > it for 3.11. Artem? OK, dropping it. -- Best Regards, Artem Bityutskiy -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a m

RE: linux-next: manual merge of the arm-soc tree with the l2-mtd tree

2013-07-01 Thread Gupta, Pekon
> > On Mon, Jul 1, 2013 at 10:44 PM, Gupta, Pekon wrote: > >> > >> Hi all, > >> > >> Today's linux-next merge of the arm-soc tree got a conflict in > >> Documentation/devicetree/bindings/mtd/gpmc-nand.txt between > commits > >> 6c88058ef927 ("ARM: OMAP2+: cleaned-up DT support of various ECC > >>

Re: linux-next: manual merge of the arm-soc tree with the l2-mtd tree

2013-07-01 Thread Olof Johansson
On Mon, Jul 1, 2013 at 10:44 PM, Gupta, Pekon wrote: >> >> Hi all, >> >> Today's linux-next merge of the arm-soc tree got a conflict in >> Documentation/devicetree/bindings/mtd/gpmc-nand.txt between commits >> 6c88058ef927 ("ARM: OMAP2+: cleaned-up DT support of various ECC >> schemes") and 212012

RE: linux-next: manual merge of the arm-soc tree with the l2-mtd tree

2013-07-01 Thread Gupta, Pekon
> > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > Documentation/devicetree/bindings/mtd/gpmc-nand.txt between commits > 6c88058ef927 ("ARM: OMAP2+: cleaned-up DT support of various ECC > schemes") and 212012138deb ("mtd: nand: omap2: updated support for > BCH4 > ECC

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

2013-07-01 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/mtd/nand/Kconfig between commit 212012138deb ("mtd: nand: omap2: updated support for BCH4 ECC scheme") from the l2-mtd tree and commit 930d800bded7 ("mtd: omap2: allow bulding as a module") from the arm-soc tree. I fix

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

2013-07-01 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in Documentation/devicetree/bindings/mtd/gpmc-nand.txt between commits 6c88058ef927 ("ARM: OMAP2+: cleaned-up DT support of various ECC schemes") and 212012138deb ("mtd: nand: omap2: updated support for BCH4 ECC scheme") from the

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

2012-11-26 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/boot/dts/spear13xx.dtsi between commit 6d7b42a447f9 ("mtd: fsmc_nand: pass the ale and cmd resource via resource") from the l2-mtd tree and commit f631b984ee10 ("ARM: SPEAr: DT: Fix existing DT support") from the arm-s

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

2012-11-26 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/mtd/nand/mxc_nand.c between commit 06f255106923 ("mtd: remove use of __devinit") from the l2-mtd tree and commit 4d62435f0601 ("mtd: mxc_nand: remove cpu_is_xxx by using platform_device_id") from the arm-soc tree. I fi

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

2012-09-24 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got conflicts in drivers/mtd/nand/bcm_umi_nand.c and drivers/mtd/nand/nand_bcm_umi.h between commit 07f4c69caf01 ("mtd: remove bcmring NAND driver") from the l2-mtd tree and commit 878040ef831a ("ARM: bcmring: use proper MMIO accessors") from th

Re: linux-next: manual merge of the arm-soc tree with the l2-mtd tree

2012-09-24 Thread Jason Cooper
On Mon, Sep 24, 2012 at 07:39:34PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > drivers/mtd/nand/orion_nand.c between commit 11a3910e730e ("mtd: > orion_nand: remove include") from the l2-mtd tree and > commit c02cecb92ed4 ("ARM: or

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

2012-09-24 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/mtd/nand/orion_nand.c between commit 11a3910e730e ("mtd: orion_nand: remove include") from the l2-mtd tree and commit c02cecb92ed4 ("ARM: orion: move platform_data definitions") from the arm-soc tree. I fixed it up (s