From: Arnd Bergmann <arnd@arndb.de>
To: Russell King - ARM Linux <linux@arm.linux.org.uk>
Cc: linux-omap@vger.kernel.org, Olof Johansson <olof@lixom.net>,
Tony Lindgren <tony@atomide.com>,
Tomi Valkeinen <tomi.valkeinen@ti.com>
Subject: Re: OMAP and arm-soc's for-next branch
Date: Sun, 25 Mar 2012 10:19:27 +0000 [thread overview]
Message-ID: <201203251019.27440.arnd@arndb.de> (raw)
In-Reply-To: <20120325075608.GB22608@n2100.arm.linux.org.uk>
On Sunday 25 March 2012, Russell King - ARM Linux wrote:
> On Sat, Mar 24, 2012 at 06:14:42PM +0000, Arnd Bergmann wrote:
> > On Saturday 24 March 2012, Russell King - ARM Linux wrote:
> > I had already pulled the omap_dss2 branch from Tomi into the next/cleanup
> > branch of arm-soc, in order to resolve a bunch of merge conflicts that we
> > discussed earlier.
>
> I don't see the commit which Tony talked about - dc7e57fa (OMAPDSS:
> register dss drivers in module init) in last night's arm-soc for-next
> branch. So, the only reason the autobuilds are able to boot is because
> I'm manually reverting 3ec2decb.
>
Sorry, it seems I pulled the wrong subset. I've updated the omap/cleanup branch
with all of the fbdev updates now, which includes the commit you mentioned here.
Hope I got it right this time.
Sorry for the repeated screwups on this.
Arnd
prev parent reply other threads:[~2012-03-25 10:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-24 12:22 OMAP and arm-soc's for-next branch Russell King - ARM Linux
2012-03-24 12:50 ` Russell King - ARM Linux
2012-03-24 17:28 ` Tony Lindgren
2012-03-24 18:14 ` Arnd Bergmann
2012-03-25 7:56 ` Russell King - ARM Linux
2012-03-25 10:19 ` Arnd Bergmann [this message]
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=201203251019.27440.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-omap@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=olof@lixom.net \
--cc=tomi.valkeinen@ti.com \
--cc=tony@atomide.com \
/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.