Hi Artem,
Today's linux-next merge of the l2-mtd tree got a conflict in
drivers/mtd/nand/nand_ids.c between commit 5bc7c33ca93a ("mtd: nand:
reintroduce NAND_NO_READRDY as NAND_NEED_READRDY") from Linus' tree and
commit dc65c450 ("mtd: add 4 Toshiba nand chips for the full-id
case") from the
Hi Artem,
Today's linux-next merge of the l2-mtd tree got a conflict in
drivers/mtd/nand/nand_ids.c between commit 5bc7c33ca93a (mtd: nand:
reintroduce NAND_NO_READRDY as NAND_NEED_READRDY) from Linus' tree and
commit dc65c450 (mtd: add 4 Toshiba nand chips for the full-id
case) from the
From: Karicheri, Muralidharan
Sent: Thursday, December 13, 2012 8:45 PM
To: Kumar, Anil
Cc: Stephen Rothwell; Artem Bityutskiy; linux-n...@vger.kernel.org;
linux-kernel@vger.kernel.org; Grant Likely
Subject: Re: linux-next: manual merge of the l2-mtd tree
From: Karicheri, Muralidharan
Sent: Thursday, December 13, 2012 8:45 PM
To: Kumar, Anil
Cc: Stephen Rothwell; Artem Bityutskiy; linux-n...@vger.kernel.org;
linux-kernel@vger.kernel.org; Grant Likely
Subject: Re: linux-next: manual merge of the l2-mtd tree
On 12/13/2012 12:38 AM, Kumar, Anil wrote:
On Thu, Dec 13, 2012 at 07:07:55, Stephen Rothwell wrote:
Hi Artem,
Today's linux-next merge of the l2-mtd tree got a conflict in
Documentation/devicetree/bindings/arm/davinci/nand.txt between commit
fed16bba8726 ("mtd: nand: davinci: fix the binding
On 12/13/2012 12:38 AM, Kumar, Anil wrote:
On Thu, Dec 13, 2012 at 07:07:55, Stephen Rothwell wrote:
Hi Artem,
Today's linux-next merge of the l2-mtd tree got a conflict in
Documentation/devicetree/bindings/arm/davinci/nand.txt between commit
fed16bba8726 (mtd: nand: davinci: fix the binding
On Thu, Dec 13, 2012 at 07:07:55, Stephen Rothwell wrote:
> Hi Artem,
>
> Today's linux-next merge of the l2-mtd tree got a conflict in
> Documentation/devicetree/bindings/arm/davinci/nand.txt between commit
> fed16bba8726 ("mtd: nand: davinci: fix the binding documentation") from
> Linus' tree
Hi Artem,
Today's linux-next merge of the l2-mtd tree got a conflict in
Documentation/devicetree/bindings/arm/davinci/nand.txt between commit
fed16bba8726 ("mtd: nand: davinci: fix the binding documentation") from
Linus' tree and commit 192afdbfbc5c ("mtd: davinci: add support for
parition
Hi Artem,
Today's linux-next merge of the l2-mtd tree got a conflict in
Documentation/devicetree/bindings/arm/davinci/nand.txt between commit
fed16bba8726 (mtd: nand: davinci: fix the binding documentation) from
Linus' tree and commit 192afdbfbc5c (mtd: davinci: add support for
parition binding
On Thu, Dec 13, 2012 at 07:07:55, Stephen Rothwell wrote:
Hi Artem,
Today's linux-next merge of the l2-mtd tree got a conflict in
Documentation/devicetree/bindings/arm/davinci/nand.txt between commit
fed16bba8726 (mtd: nand: davinci: fix the binding documentation) from
Linus' tree and
10 matches
Mail list logo
