Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934041AbZLOWVR (ORCPT ); Tue, 15 Dec 2009 17:21:17 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S934031AbZLOWVL (ORCPT ); Tue, 15 Dec 2009 17:21:11 -0500 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:56802 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934030AbZLOWVI (ORCPT ); Tue, 15 Dec 2009 17:21:08 -0500 Date: Tue, 15 Dec 2009 23:20:57 +0100 From: Pavel Machek To: Arve Hj?nnev?g Cc: Daniel Walker , Brian Swetland , kernel list , linux-arm-kernel , Iliyan Malchev , linux-kernel@codeaurora.org Subject: Re: tree with htc dream support Message-ID: <20091215222057.GT24406@elf.ucw.cz> References: <20091205221100.GA32522@elf.ucw.cz> <1260054737.23633.35.camel@desktop> <1260627482.20913.7.camel@desktop> <20091213212504.GD5114@elf.ucw.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Warning: Reading this can be dangerous to your mental health. User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1580 Lines: 39 > >> >> A first pass of this is available in the android-msm-2.6.32-test1 > >> >> branch at git://android.git.kernel.org/kernel/experimental.git. > >> >> > >> >> http://android.git.kernel.org/?p=kernel/experimental.git;a=shortlog;h=refs/heads/android-msm-2.6.32-test1 > >> > > >> > Does this have the the newest wakelock code in it? From the all the > >> > re-writes that you've done. > >> > >> No. > > > > One more wish list item: many drivers are now available in > > drivers/staging/dream, and are being slowly cleaned up. Would it be > > possible to start using those for android-msm-2.6.32 tree? > > > > You'll need to reapply some stuff I had to remove (like wakelocks), > > but it should be still better/less work long term to patch those back > > in than maintaining separate copy. Diff should get much smaller... > > I do plan to look at these, but I don't know when I'll get to it. Thanks. Actually... a question. How do I generate diff against mainline from the tree? Stuff like 'git diff -r v2.6.11' works, but I need 'git diff -r v2.6.32', and that fails because tag is just not there :-(. Well, 'git diff -r 22763c5cf3690a681551162c15d34d935308c8d7' works, but... Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html -- 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/