Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754859AbZICLAR (ORCPT ); Thu, 3 Sep 2009 07:00:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754102AbZICLAQ (ORCPT ); Thu, 3 Sep 2009 07:00:16 -0400 Received: from smtp.nokia.com ([192.100.105.134]:46305 "EHLO mgw-mx09.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753651AbZICLAP (ORCPT ); Thu, 3 Sep 2009 07:00:15 -0400 Subject: Re: [PATCH 00/18] OMAP: DSS2: Intro From: Tomi Valkeinen Reply-To: tomi.valkeinen@nokia.com To: ext Andrew Morton Cc: Artem Bityutskiy , "tony@atomide.com" , "hvaibhav@ti.com" , "khasim@ti.com" , "sakoman@gmail.com" , "linux-kernel@vger.kernel.org" , "linux-omap@vger.kernel.org" In-Reply-To: <20090902151126.f465bb15.akpm@linux-foundation.org> References: <1251462337-12531-1-git-send-email-tomi.valkeinen@nokia.com> <4A9B96A7.5040005@gmail.com> <5e088bd90908310720p290ba68dwd6106a778fd7c740@mail.gmail.com> <0680EC522D0CC943BC586913CF3768C0037CE48136@dbde02.ent.ti.com> <19F8576C6E063C45BE387C64729E73940436A4A9B6@dbde02.ent.ti.com> <20090831155518.GC16876@atomide.com> <4A9CC8DB.2050803@gmail.com> <20090902151126.f465bb15.akpm@linux-foundation.org> Content-Type: text/plain Organization: Nokia Oyj Date: Thu, 03 Sep 2009 14:00:01 +0300 Message-Id: <1251975601.10724.9.camel@tubuntu> Mime-Version: 1.0 X-Mailer: Evolution 2.26.1 Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 03 Sep 2009 11:00:07.0487 (UTC) FILETIME=[B2C2E4F0:01CA2C85] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2701 Lines: 65 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 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-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/