From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Rob Herring <robherring2@gmail•com>, Joerg Roedel <joro@8bytes•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Joerg Roedel <jroedel@suse•de>,
Robin Murphy <robin.murphy@arm•com>,
Will Deacon <will.deacon@arm•com>
Subject: linux-next: manual merge of the dt-rh tree with the iommu tree
Date: Wed, 11 May 2016 12:20:37 +1000 [thread overview]
Message-ID: <20160511122037.43cd3db8@canb.auug.org.au> (raw)
Hi Rob,
Today's linux-next merge of the dt-rh tree got a conflict in:
drivers/iommu/arm-smmu.c
between commit:
d54663573131 ("iommu/arm-smmu: Use per-domain page sizes.")
from the iommu tree and commit:
cb6c27bb0912 ("iommu/arm-smmu: Make use of phandle iterators in device-tree parsing")
from the dt-rh tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/iommu/arm-smmu.c
index 0360919a5737,a1c965cdcfad..000000000000
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@@ -397,6 -357,14 +397,12 @@@ struct arm_smmu_domain
struct iommu_domain domain;
};
+ struct arm_smmu_phandle_args {
+ struct device_node *np;
+ int args_count;
+ uint32_t args[MAX_MASTER_STREAMIDS];
+ };
+
-static struct iommu_ops arm_smmu_ops;
-
static DEFINE_SPINLOCK(arm_smmu_devices_lock);
static LIST_HEAD(arm_smmu_devices);
@@@ -1950,11 -1829,14 +1969,14 @@@ static int arm_smmu_device_dt_probe(str
i++;
}
+
dev_notice(dev, "registered %d master devices\n", i);
+ kfree(masterspec);
+
parse_driver_options(smmu);
- if (smmu->version > ARM_SMMU_V1 &&
+ if (smmu->version == ARM_SMMU_V2 &&
smmu->num_context_banks != smmu->num_context_irqs) {
dev_err(dev,
"found only %d context interrupt(s) but %d required\n",
next reply other threads:[~2016-05-11 2:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-11 2:20 Stephen Rothwell [this message]
2016-05-11 11:31 ` linux-next: manual merge of the dt-rh tree with the iommu tree Robin Murphy
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=20160511122037.43cd3db8@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=joro@8bytes$(echo .)org \
--cc=jroedel@suse$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robherring2@gmail$(echo .)com \
--cc=robin.murphy@arm$(echo .)com \
--cc=will.deacon@arm$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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