LinuxLists.cc - linux-next: manual merge of the mtd tree with Linus' tree

2011-05-27 04:00:33

Subject: linux-next: manual merge of the mtd tree with Linus' tree

Hi David,

Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/maps/integrator-flash.c between commit adf0040096e4 ("ARM:
6906/1: MTD: Remove integrator-flash") from Linus' tree and commit
ee0e87b174bb ("mtd: convert remaining users to mtd_device_register()")
from the mtd tree.

The former removes the file updated by the latter, so I just removed it.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/

Attachments:

(No filename) (475.00 B)
(No filename) (490.00 B)
Download all attachments

2011-05-27 07:48:54

by Artem Bityutskiy

[permalink] [raw]

Subject: Re: linux-next: manual merge of the mtd tree with Linus' tree

On Fri, 2011-05-27 at 14:00 +1000, ext Stephen Rothwell wrote:
> Hi David,
>
> Today's linux-next merge of the mtd tree got a conflict in
> drivers/mtd/maps/integrator-flash.c between commit adf0040096e4 ("ARM:
> 6906/1: MTD: Remove integrator-flash") from Linus' tree and commit
> ee0e87b174bb ("mtd: convert remaining users to mtd_device_register()")
> from the mtd tree.
>
> The former removes the file updated by the latter, so I just removed it.

Yes, this is right, thanks.

--
Best Regards,
Artem Bityutskiy (Артём Битюцкий)