From: Robin Murphy <robin.murphy@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
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>, Will Deacon <will.deacon@arm.com>
Subject: Re: linux-next: manual merge of the dt-rh tree with the iommu tree
Date: Wed, 11 May 2016 12:31:13 +0100 [thread overview]
Message-ID: <57331801.90903@arm.com> (raw)
In-Reply-To: <20160511122037.43cd3db8@canb.auug.org.au>
Hi Stephen, Rob,
On 11/05/16 03:20, Stephen Rothwell wrote:
> 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.
Sorry, I'll take partial responsibility for that, as I'd forgotten about
the SMMU patch Rob was carrying when Joerg picked up my conflicting
patches. The resolution looks fine to me.
Robin.
prev parent reply other threads:[~2016-05-11 11:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-11 2:20 linux-next: manual merge of the dt-rh tree with the iommu tree Stephen Rothwell
2016-05-11 11:31 ` Robin Murphy [this message]
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=57331801.90903@arm.com \
--to=robin.murphy@arm.com \
--cc=joro@8bytes.org \
--cc=jroedel@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robherring2@gmail.com \
--cc=sfr@canb.auug.org.au \
--cc=will.deacon@arm.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).