From: khilman@linaro.org (Kevin Hilman)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 0/3] ARM: SoC: Second round of changes for v3.12
Date: Mon, 9 Sep 2013 15:42:32 -0700 [thread overview]
Message-ID: <1378766555-9679-1-git-send-email-khilman@linaro.org> (raw)
Hi Linus,
Here's a 2nd round of changes from ARM SoC land.
The main thing of note (or of potential annoyance factor) here is the
handful of conflicts in PULL 2/3 coming from platform changes
conflicting with driver changes going in to the V4L tree. I've listed
them in detail in that pull request, and we will work with the
platform maintainer on the workflow to avoid this in the future.
For future reference, when it comes to these conflicts, do you want to
see a summary of the suggested resolutions, a published branch with
the resolutions, both or neither? Just curious.
Kevin
next reply other threads:[~2013-09-09 22:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-09 22:42 Kevin Hilman [this message]
2013-09-09 22:42 ` [GIT PULL 1/3] ARM: SoC drivers for v3.12 Kevin Hilman
2013-09-09 22:42 ` [GIT PULL 2/3] ARM: Renesas SoC cleanup, refactoring and more SMP support Kevin Hilman
2013-09-09 22:42 ` [GIT PULL 3/3] ARM: SoC late changes for v3.12 Kevin Hilman
2013-09-09 23:49 ` [GIT PULL 0/3] ARM: SoC: Second round of " Linus Torvalds
2013-09-10 0:04 ` NeilBrown
2013-09-10 0:06 ` Kevin Hilman
2013-09-10 15:05 ` David Woodhouse
2013-09-10 15:31 ` Linus Torvalds
2013-09-10 15:43 ` Stephen Warren
2013-09-10 15:56 ` Linus Torvalds
2013-09-10 16:00 ` David Woodhouse
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=1378766555-9679-1-git-send-email-khilman@linaro.org \
--to=khilman@linaro.org \
--cc=linux-arm-kernel@lists.infradead.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).