Hi, On Thu, 2009-09-03 at 00:11 +0200, ext Andrew Morton wrote: > On Tue, 01 Sep 2009 10:10:19 +0300 > Artem Bityutskiy <dedekind1@xxxxxxxxx> wrote: > > > Andrew, > > > > could you please help with merging this piece of (well written) code? > > Could you give your blessing to include it into linux-next now, and > > merge this during the next merge window? > > I'll merge them (after I've looked through them, which I'll do now). > > But there are more rejects than I'm prepared to cope with. The various > arch/arm files have undergone some changes in linux-next which yield > more breakage than I'm prepared to try to fix. For example, > arch/arm/mach-omap2/board-3430sdp.c:sdp3430_config[] ends up being an > empty array! I rebased the patches on top of linux-next. The tree is at http://gitorious.org/linux-omap-dss2/linux , in branch linux-next-dss. The only conflict was in board-3430sdp, and yes, sdp3430_config is supposed to end up as an empty array. > Then there's the matter of these patches, already in -mm: > > omapfb-add-support-for-the-apollon-lcd.patch > omapfb-add-support-for-mipi-dcs-compatible-lcds.patch > omapfb-add-support-for-the-amstrad-delta-lcd.patch > omapfb-add-support-for-the-2430sdp-lcd.patch > omapfb-add-support-for-the-omap2evm-lcd.patch > omapfb-add-support-for-the-3430sdp-lcd.patch > omapfb-add-support-for-the-omap3-evm-lcd.patch > omapfb-add-support-for-the-omap3-beagle-dvi-output.patch > omapfb-add-support-for-the-gumstix-overo-lcd.patch > omapfb-add-support-for-the-zoom-mdk-lcd.patch > omapfb-add-support-for-rotation-on-the-blizzard-lcd-ctrl.patch > n770-enable-lcd-mipi-dcs-in-kconfig.patch > omapfb-dispc-various-typo-fixes.patch > omapfb-dispc-disable-iface-clocks-along-with-func-clocks.patch > omapfb-dispc-enable-wake-up-capability.patch > omapfb-dispc-allow-multiple-external-irq-handlers.patch > omapfb-suspend-resume-only-if-fb-device-is-already-initialized.patch > omapfb-fix-coding-style-remove-dead-line.patch > omapfb-add-fb-manual-update-option-to-kconfig.patch > omapfb-hwa742-fix-pointer-to-be-const.patch These are not in linux-next, I think. They are for the old OMAP display subsystem, and may cause some conflicts with DSS2. I think those patches should go in also, as the old driver is used for OMAP1 and fo all the other boards that have not been ported to use DSS2. Should I rebase DSS2 on top of -mm and solve the conflicts? If so, where can I find your tree? Tomi -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
