From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: mvebu: fix build breaks from multi-platform conversion
Date: Thu, 27 Sep 2012 16:01:43 +0000 [thread overview]
Message-ID: <201209271601.43717.arnd@arndb.de> (raw)
In-Reply-To: <20120927172618.7ba233f0@skate>
On Thursday 27 September 2012, Thomas Petazzoni wrote:
> This select was already part added as a part of:
>
> commit 7e8d941567c99a03390154a7bb116d1b03db82b3
> Author: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Date: Thu Sep 13 17:41:43 2012 +0200
>
> pinctrl: mvebu: pinctrl driver core
>
> This patch adds a pinctrl driver core for Marvell SoCs plus DT
> binding documentation. This core driver will be used by SoC family
> specific drivers, i.e. Armada XP, Armada 370, Dove, Kirkwood, aso.
>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Reviewed-by: Stephen Warren <swarren@wwwdotorg.org>
> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
>
> Conflicts:
>
> arch/arm/Kconfig
>
> which was requested for pull from the kirkwood/drivers branch of Jason
> Cooper repository. If it is no longer there, then it is a merge
> conflict resolution mistake.
I believe it was lost again in the move to the multiplatform configuration,
which moves the ARCH_MVEBU definition to arch/arm/mach-mvebu/Kconfig.
automated merges with git don't notice this. Same for the other one.
Arnd
next prev parent reply other threads:[~2012-09-27 16:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-27 15:10 [PATCH] ARM: mvebu: fix build breaks from multi-platform conversion Rob Herring
2012-09-27 15:26 ` Thomas Petazzoni
2012-09-27 16:01 ` Arnd Bergmann [this message]
2012-09-27 15:30 ` Arnd Bergmann
2012-09-28 20:32 ` Arnd Bergmann
2012-09-29 21:34 ` Olof Johansson
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=201209271601.43717.arnd@arndb.de \
--to=arnd@arndb.de \
--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 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.