From: Joerg Roedel <joro@8bytes.org>
To: Thierry Reding <treding@nvidia.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
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 17:16:48 +0100 [thread overview]
Message-ID: <20141124161648.GI3762@8bytes.org> (raw)
In-Reply-To: <20141124093237.GC19045@ulmo.nvidia.com>
Hi Thierry,
On Mon, Nov 24, 2014 at 10:32:38AM +0100, Thierry Reding wrote:
> 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?
Yes, you can pull in the core branch from the iommu-tree. It should
contain the conflicting patch.
Joerg
prev parent reply other threads:[~2014-11-24 16:16 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
2014-11-24 9:32 ` Thierry Reding
2014-11-24 16:16 ` Joerg Roedel [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=20141124161648.GI3762@8bytes.org \
--to=joro@8bytes.org \
--cc=ccross@android.com \
--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 \
--cc=treding@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.