Hello Sascha, On Fri, Feb 28, 2014 at 08:45:30AM +0100, Sascha Hauer wrote: > On Fri, Feb 28, 2014 at 08:25:48AM +0100, Sascha Hauer wrote: > > Applied this series. I skipped the pca100 patch as this one has the > > partition layout in the devicetree now. > > And I had a merge conflict in fs/devfs-core.c with: > > commit 0c76b7e3779d1d38b8b70596b122bab076d9f26e > Author: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> > Date: Tue Jan 14 11:51:35 2014 +0100 > > mtd: register mtd partitions as real mtd devices > > So far mtd partitions were mtd devices, but these were not registered. > This patch changes this. mtd partitions are now registered like real > mtd devices. This makes them part of the device hierarchy. > > Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> > > I'm confident I did it right, but maybe you better have a look at the > result in -next. Looking at ff202f715c23 (Merge branch 'for-next/partitionhelper' into next) that looks exactly as I had resolved the problem. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
