Hi Brian,
Today's linux-next merge of the l2-mtd tree got a conflict in:
drivers/mtd/mtdcore.c
between commit:
472b444eef93 ("mtd: fix cmdlinepart parser, early naming for auto-filled MTD")
from the mtd tree and commit:
07fd2f871c5e ("mtd: partitions: pass around 'mtd_partitions' wrappe
On Fri, 2013-03-15 at 11:58 +1100, Stephen Rothwell wrote:
> Hi Artem,
>
> Today's linux-next merge of the l2-mtd tree got a conflict in
> include/linux/mtd/nand.h between commit 5bc7c33ca93a ("mtd: nand:
> reintroduce NAND_NO_READRDY as NAND_NEED_READRDY") from the mtd tree and
> commit edac33118
Hi Artem,
Today's linux-next merge of the l2-mtd tree got a conflict in
include/linux/mtd/nand.h between commit 5bc7c33ca93a ("mtd: nand:
reintroduce NAND_NO_READRDY as NAND_NEED_READRDY") from the mtd tree and
commit edac3311879c ("mtd: nand: remove AG-AND support") from the l2-mtd
tree.
I fixed
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 the mtd tree and
commits a4c121db7e85 ("mtd: nand_ids: minor clean-ups"), c11138000b6d
("mtd: decommi
On Wed, 2012-07-25 at 17:36 +0200, Gerlando Falauto wrote:
>
> thanks for your explanation.
> So, is it correct to say that any patch contained within l2-mtd (but
> *NOT* within linux-mtd) will eventually be killed? (Or rather,
> *replaced* by the version eventually applied to linux-mtd)?
Usual
Hi David,
On 07/25/2012 05:26 PM, David Woodhouse wrote:
On Wed, 2012-07-25 at 17:21 +0200, Gerlando Falauto wrote:
So could someone please spend a few words on what happened in the meantime?
To me it looks like the l2-mtd tree got rebased at some point, but I'm
quite at loss about this whole
Hi folks, Stepehen,
On 07/17/2012 03:00 AM, Stephen Rothwell wrote:
Hi Artem,
Today's linux-next merge of the l2-mtd tree got a conflict in
drivers/mtd/chips/cfi_cmdset_0002.c between commit 420962884379 ("mtd:
cfi_cmdset_0002: Micron M29EW bugfixes as per TN-13-07") from the mtd
tree and commi
On Wed, 2012-07-25 at 17:21 +0200, Gerlando Falauto wrote:
>
> So could someone please spend a few words on what happened in the meantime?
> To me it looks like the l2-mtd tree got rebased at some point, but I'm
> quite at loss about this whole back-and-forth between trees.
> I'm sure a few words
Hi Artem,
Today's linux-next merge of the l2-mtd tree got a conflict in
drivers/mtd/chips/cfi_cmdset_0002.c between commit 420962884379 ("mtd:
cfi_cmdset_0002: Micron M29EW bugfixes as per TN-13-07") from the mtd
tree and commit 39c0c188e160 ("mtd: cfi_cmdset_0002: Micron M29EW
bugfixes as per TN-
9 matches
Mail list logo
