From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: OMAP2+: Trivial fix for IOMMU merge issue (Re: [GIT PULL v2] ARM: arm-soc fixes for 3.8)
Date: Thu, 20 Dec 2012 11:50:34 -0800 [thread overview]
Message-ID: <20121220195033.GI21056@atomide.com> (raw)
In-Reply-To: <20121220190847.GF21056@atomide.com>
Commit 787314c3 (Merge tag 'iommu-updates-v3.8' of
git://git./linux/kernel/git/joro/iommu) did not account
for the changed header location.
The headers were made local to mach-omap2 as they
are specific to omap2+ only, and we wanted to get
most of the #include <plat/*.h> headers fixed up
anyways for the ARM multiplatform support.
We attempted to avoid this kind of merge conflict
early on by setting up a minimal git branch shared by
the arm-soc tree and the iommu tree, but looks like
we still hit a merge issue there as the branches got
merged as various topic branches.
Cc: Joerg Roedel <joro@8bytes.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
Found one more merge issue with the recent IOMMU merge.
Linus, maybe apply this fix directly as Olof's branch
is based on an earlier commit?
--- a/arch/arm/mach-omap2/omap-iommu.c
+++ b/arch/arm/mach-omap2/omap-iommu.c
@@ -16,8 +16,8 @@
#include <linux/slab.h>
#include <linux/platform_data/iommu-omap.h>
-#include <plat/omap_hwmod.h>
-#include <plat/omap_device.h>
+#include "omap_hwmod.h"
+#include "omap_device.h"
static int __init omap_iommu_dev_init(struct omap_hwmod *oh, void *unused)
{
next prev parent reply other threads:[~2012-12-20 19:50 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-20 16:38 [GIT PULL v2] ARM: arm-soc fixes for 3.8 Olof Johansson
2012-12-20 16:49 ` Linus Torvalds
2012-12-20 17:28 ` Olof Johansson
2012-12-20 17:35 ` Tony Lindgren
2012-12-20 17:44 ` Linus Torvalds
2012-12-20 17:56 ` Russell King - ARM Linux
2012-12-20 18:08 ` Olof Johansson
2012-12-20 18:45 ` Tony Lindgren
2012-12-20 19:00 ` Linus Torvalds
2012-12-20 19:08 ` Tony Lindgren
2012-12-20 19:50 ` Tony Lindgren [this message]
2012-12-21 2:43 ` Benjamin Herrenschmidt
2012-12-20 18:47 ` Russell King - ARM Linux
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=20121220195033.GI21056@atomide.com \
--to=tony@atomide.com \
--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).