From: Thierry Reding <treding@nvidia.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Joerg Roedel <joro@8bytes.org>,
Stephen Warren <swarren@nvidia.com>,
Colin Cross <ccross@android.com>, Olof Johansson <olof@lixom.net>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Olav Haugan <ohaugan@codeaurora.org>
Subject: Re: linux-next: manual merge of the iommu tree with the tegra tree
Date: Mon, 24 Nov 2014 10:32:38 +0100 [thread overview]
Message-ID: <20141124093237.GC19045@ulmo.nvidia.com> (raw)
In-Reply-To: <20141124153310.61fc2202@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 819 bytes --]
On Mon, Nov 24, 2014 at 03:33:10PM +1100, Stephen Rothwell wrote:
> * PGP Signed by an unknown key
>
> Hi Joerg,
>
> Today's linux-next merge of the iommu tree got a conflict in
> drivers/iommu/tegra-smmu.c between commit a2257374a4bd ("memory: Add
> NVIDIA Tegra memory controller support") from the tegra tree and commit
> 315786ebbf4a ("iommu: Add iommu_map_sg() function") from the iommu tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
This conflict is uglier than I had anticipated. Perhaps it would make
sense to pull in a stable IOMMU branch into Tegra so that I can resolve
the conflict on top of that?
Joerg, do you have a stable branch containing the above commits that you
could provide for me to pull into the Tegra tree?
Thierry
[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Thierry Reding <treding@nvidia.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Joerg Roedel <joro@8bytes.org>,
Stephen Warren <swarren@nvidia.com>,
"Colin Cross" <ccross@android.com>,
Olof Johansson <olof@lixom.net>, <linux-next@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
Olav Haugan <ohaugan@codeaurora.org>
Subject: Re: linux-next: manual merge of the iommu tree with the tegra tree
Date: Mon, 24 Nov 2014 10:32:38 +0100 [thread overview]
Message-ID: <20141124093237.GC19045@ulmo.nvidia.com> (raw)
In-Reply-To: <20141124153310.61fc2202@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 819 bytes --]
On Mon, Nov 24, 2014 at 03:33:10PM +1100, Stephen Rothwell wrote:
> * PGP Signed by an unknown key
>
> Hi Joerg,
>
> Today's linux-next merge of the iommu tree got a conflict in
> drivers/iommu/tegra-smmu.c between commit a2257374a4bd ("memory: Add
> NVIDIA Tegra memory controller support") from the tegra tree and commit
> 315786ebbf4a ("iommu: Add iommu_map_sg() function") from the iommu tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
This conflict is uglier than I had anticipated. Perhaps it would make
sense to pull in a stable IOMMU branch into Tegra so that I can resolve
the conflict on top of that?
Joerg, do you have a stable branch containing the above commits that you
could provide for me to pull into the Tegra tree?
Thierry
[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2014-11-24 9:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-24 4:33 linux-next: manual merge of the iommu tree with the tegra tree Stephen Rothwell
2014-11-24 9:32 ` Thierry Reding [this message]
2014-11-24 9:32 ` Thierry Reding
2014-11-24 16:16 ` Joerg Roedel
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=20141124093237.GC19045@ulmo.nvidia.com \
--to=treding@nvidia.com \
--cc=ccross@android.com \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ohaugan@codeaurora.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=swarren@nvidia.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 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.