From: Thierry Reding <thierry.reding@gmail.com>
To: Nishanth Menon <nm@ti.com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Tim Harvey <tharvey@gateworks.com>,
Shawn Guo <shawn.guo@linaro.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the imx-mxs tree
Date: Fri, 25 Oct 2013 15:03:44 +0200 [thread overview]
Message-ID: <1382706224-8859-6-git-send-email-treding@nvidia.com> (raw)
In-Reply-To: <1382706224-8859-1-git-send-email-treding@nvidia.com>
Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/mach-imx/mach-imx6q.c
caused by commits 6aec339 (PM / OPP: rename header to linux/pm_opp.h) and
0794410 (imx: add PCI fixup for PEX860X on Gateworks board).
I fixed it up (see below). Please verify that the resolution looks good.
Thanks,
Thierry
---
diff --cc arch/arm/mach-imx/mach-imx6q.c
index eae5642,1ac719d..bc98799
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@@ -23,8 -23,9 +23,10 @@@
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h>
- #include <linux/pm_opp.h>
+ #include <linux/opp.h>
+ #include <linux/pci.h>
#include <linux/phy.h>
++#include <linux/pm_opp.h>
#include <linux/reboot.h>
#include <linux/regmap.h>
#include <linux/micrel_phy.h>
next prev parent reply other threads:[~2013-10-25 13:03 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-24 16:31 linux-next: Tree for Oct 24 Thierry Reding
2013-10-24 20:02 ` linux-next: Tree for Oct 24 (xilinx_uartps) Randy Dunlap
2013-10-25 5:02 ` linux-next: Tree for Oct 24 Guenter Roeck
2013-10-25 8:35 ` Thierry Reding
2013-10-25 13:16 ` Olof Johansson
2013-10-25 13:24 ` Mark Brown
2013-10-25 13:33 ` Olof Johansson
2013-10-25 15:45 ` Mark Brown
2013-10-25 13:35 ` Thierry Reding
2013-10-25 13:43 ` Olof Johansson
2013-10-25 14:17 ` Thierry Reding
2013-10-25 15:02 ` Guenter Roeck
2013-10-25 15:17 ` Thierry Reding
2013-10-25 17:17 ` Guenter Roeck
2013-10-25 18:04 ` Geert Uytterhoeven
2013-10-25 13:03 ` linux-next: manual merge of the c6x tree Thierry Reding
2013-10-25 13:03 ` linux-next: manual merge of the h8300-remove tree Thierry Reding
2013-10-25 13:35 ` Mark Salter
2013-10-25 15:09 ` Guenter Roeck
2013-10-25 13:03 ` linux-next: manual merge of the mfd-lj tree Thierry Reding
2013-10-25 13:03 ` linux-next: manual merge of the tip tree Thierry Reding
2013-10-25 13:25 ` Will Deacon
2013-10-26 8:40 ` Ingo Molnar
2013-10-26 14:01 ` Will Deacon
2013-10-27 7:12 ` Ingo Molnar
2013-10-27 10:00 ` Russell King - ARM Linux
2013-10-28 7:47 ` Thierry Reding
2013-10-28 8:45 ` Russell King - ARM Linux
2013-10-25 13:03 ` linux-next: manual merge of the kvm-arm tree Thierry Reding
2013-10-25 13:07 ` Marc Zyngier
2013-10-25 13:03 ` Thierry Reding [this message]
2013-10-25 13:22 ` linux-next: manual merge of the c6x tree Mark Salter
2013-10-25 13:36 ` Thierry Reding
2013-10-26 13:19 ` Russell King - ARM Linux
2013-10-28 7:34 ` Thierry Reding
-- strict thread matches above, loose matches on Subject: below --
2013-10-09 14:14 linux-next: Tree for Oct 9 Thierry Reding
2013-10-09 14:14 ` linux-next: manual merge of the imx-mxs tree Thierry Reding
2013-10-09 16:56 ` Fabio Estevam
2013-10-08 13:44 linux-next: Tree for Oct 8 Thierry Reding
2013-10-08 13:44 ` linux-next: manual merge of the imx-mxs tree Thierry Reding
2013-10-09 1:25 ` Shawn Guo
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=1382706224-8859-6-git-send-email-treding@nvidia.com \
--to=thierry.reding@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nm@ti.com \
--cc=rafael.j.wysocki@intel.com \
--cc=shawn.guo@linaro.org \
--cc=tharvey@gateworks.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 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).