From: Sid Boyce <sboyce@blueyonder.co.uk>
To: "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>
Subject: Re: linux-next: manual merge of the omap_dss2 tree with the omap tree
Date: Tue, 17 Nov 2009 03:08:28 +0000 [thread overview]
Message-ID: <4B0213AC.6050502@blueyonder.co.uk> (raw)
In-Reply-To: <20091116160402.deb0cc82.sfr@canb.auug.org.au>
On 16/11/09 05:04, Stephen Rothwell wrote:
> Hi Tomi,
>
> Today's linux-next merge of the omap_dss2 tree got a conflict in
> arch/arm/configs/omap_3430sdp_defconfig between the omap tree and the
> omap_dss2 tree.
>
> I just used the version from the omap tree as I can't figure out anything
> better, sorry.
In every incarnation, EHCI support is missing " default y if
ARCH_OMAP34XX" in drivers/usb/Kconfig
Regards
Sid.
--
Sid Boyce ... Hamradio License G3VBV, Licensed Private Pilot
Emeritus IBM/Amdahl Mainframes and Sun/Fujitsu Servers Tech Support
Specialist, Cricket Coach
Microsoft Windows Free Zone - Linux used for all Computing Tasks
next prev parent reply other threads:[~2009-11-17 3:08 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-16 5:04 linux-next: manual merge of the omap_dss2 tree with the omap tree Stephen Rothwell
2009-11-16 5:04 ` Stephen Rothwell
2009-11-16 10:06 ` Tomi Valkeinen
2009-11-16 18:34 ` Tony Lindgren
2009-11-17 10:00 ` Tomi Valkeinen
2009-11-17 23:49 ` Stephen Rothwell
2009-11-17 3:08 ` Sid Boyce [this message]
2009-11-17 13:30 ` Is the OMAP patch process badly flawed? Sid Boyce
2009-11-17 13:34 ` Gadiyar, Anand
2009-11-17 14:00 ` Sid Boyce
2009-11-17 14:51 ` Gadiyar, Anand
2009-11-17 21:44 ` Sid Boyce
2009-11-17 22:07 ` Felipe Contreras
2009-11-18 3:20 ` Sid Boyce
-- strict thread matches above, loose matches on Subject: below --
2009-12-09 3:59 linux-next: manual merge of the omap_dss2 tree with the omap tree Stephen Rothwell
2010-02-03 4:29 Stephen Rothwell
2010-02-03 4:29 ` Stephen Rothwell
2010-02-03 12:29 ` Grazvydas Ignotas
2010-02-03 17:12 ` Tony Lindgren
2010-02-04 9:42 ` Tomi Valkeinen
2010-02-08 6:25 Stephen Rothwell
2010-02-08 6:25 ` Stephen Rothwell
2010-02-08 9:29 ` Tomi Valkeinen
2010-02-08 10:57 ` Stephen Rothwell
2010-02-08 11:43 ` Tomi Valkeinen
2010-02-09 16:52 ` Tony Lindgren
2010-02-10 8:20 ` Tomi Valkeinen
2010-02-10 9:52 ` Hiremath, Vaibhav
2010-03-11 4:18 Stephen Rothwell
2010-03-11 16:53 ` Tony Lindgren
2010-03-11 22:18 ` Stephen Rothwell
2010-05-07 3:43 Stephen Rothwell
2010-05-07 3:43 ` Stephen Rothwell
2010-05-10 20:20 ` Tony Lindgren
2010-05-12 8:59 ` Tomi Valkeinen
2010-05-14 19:09 ` Tony Lindgren
2010-05-17 7:07 ` Tomi Valkeinen
2011-02-17 2:10 Stephen Rothwell
2011-02-17 2:10 ` Stephen Rothwell
2011-02-17 2:10 Stephen Rothwell
2011-02-17 2:10 ` Stephen Rothwell
2011-02-18 2:25 Stephen Rothwell
2011-02-18 2:25 ` Stephen Rothwell
2011-02-21 3:16 Stephen Rothwell
2011-02-21 3:16 ` Stephen Rothwell
2011-02-21 8:47 ` Tomi Valkeinen
2011-02-24 21:23 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B0213AC.6050502@blueyonder.co.uk \
--to=sboyce@blueyonder.co.uk \
--cc=linux-omap@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.