From: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>,
linux-omap@vger.kernel.org,
linux-fbdev <linux-fbdev@vger.kernel.org>
Subject: Re: [GIT PULL] OMAP DSS for v3.4
Date: Thu, 22 Mar 2012 15:51:28 +0000 [thread overview]
Message-ID: <4F6B4A80.309@gmx.de> (raw)
In-Reply-To: <201203191624.42020.arnd@arndb.de>
Arnd,
On 03/19/2012 04:24 PM, Arnd Bergmann wrote:
> I've looked at the specific conflicts again, and it seems that the only
> conflicting commit in arm-soc is 2e3ee9f45b "ARM: OMAP1: Move most of
> plat/io.h into local iomap.h". I'm planning to send that one very early,
> as soon as Russell has his first set up patches merged, so I don't
> actually have to resolve the conflict here unless Florian is also
> there early.
just for your info, I am going to send my pull request today. As I
didn't find any pull request from you until now, I didn't pull any of
the branches below.
Best regards,
Florian Tobias Schandinat
>
> Florian, if I end up being faster than you, feel free to pull the
> omap/cleanup branch from git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
> if you want to get a conflict resolution using the minimum set of patches
> from upstream. Alternatively, pulling "cleanup" from
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap should give you
> the same.
>
> Arnd
> --
> To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
next prev parent reply other threads:[~2012-03-22 15:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-19 11:01 [GIT PULL] OMAP DSS for v3.4 Tomi Valkeinen
2012-03-19 11:01 ` Tomi Valkeinen
2012-03-19 16:24 ` Arnd Bergmann
2012-03-19 16:24 ` Arnd Bergmann
2012-03-22 15:51 ` Florian Tobias Schandinat [this message]
2012-03-22 15:58 ` Arnd Bergmann
2012-03-21 12:39 ` Tomi Valkeinen
2012-03-21 12:39 ` Tomi Valkeinen
2012-03-21 18:48 ` Florian Tobias Schandinat
2012-03-21 18:45 ` Florian Tobias Schandinat
2012-03-21 18:45 ` Florian Tobias Schandinat
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=4F6B4A80.309@gmx.de \
--to=florianschandinat@gmx.de \
--cc=arnd@arndb.de \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=tomi.valkeinen@ti.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.