From: Joerg Roedel <joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
To: Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>,
Alexandre Courbot
<gnurou-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Hiroshi Doyu <hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
Subject: Re: [PATCH 2/4] iommu/tegra: Setup aperture
Date: Tue, 31 Mar 2015 15:35:21 +0200 [thread overview]
Message-ID: <20150331133521.GB22683@8bytes.org> (raw)
In-Reply-To: <20150327101935.GB17976-AwZRO8vwLAwmlAP/+Wk3EA@public.gmane.org>
On Fri, Mar 27, 2015 at 11:19:36AM +0100, Thierry Reding wrote:
> I also just realized that this hunk conflicts with the IOMMU domain
> alloc/free series that you sent out yesterday. Were you planning on
> merging that series for 4.1? If so I can regenerate these patches on
> top of your series.
Yes, I just merged the series. But please just base these patches on
plain v4.0-rc6, so I can put them into a seperate branch. I'll try to
solve the conflict then by myself.
Joerg
next prev parent reply other threads:[~2015-03-31 13:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-27 10:07 [PATCH 1/4] iommu/tegra-smmu: Add debugfs support Thierry Reding
[not found] ` <1427450847-17719-1-git-send-email-thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-03-27 10:07 ` [PATCH 2/4] iommu/tegra: Setup aperture Thierry Reding
[not found] ` <1427450847-17719-2-git-send-email-thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-03-27 10:19 ` Thierry Reding
[not found] ` <20150327101935.GB17976-AwZRO8vwLAwmlAP/+Wk3EA@public.gmane.org>
2015-03-31 13:35 ` Joerg Roedel [this message]
2015-03-27 10:07 ` [PATCH 3/4] iommu/tegra: gart: Set aperture at domain initialization time Thierry Reding
2015-03-27 10:07 ` [PATCH 4/4] iommu/tegra: smmu: Compute PFN mask at runtime Thierry Reding
2015-03-27 10:15 ` [PATCH 1/4] iommu/tegra-smmu: Add debugfs support Thierry Reding
[not found] ` <20150327101539.GA17976-AwZRO8vwLAwmlAP/+Wk3EA@public.gmane.org>
2015-03-31 15:02 ` Joerg Roedel
[not found] ` <20150331150214.GE22683-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
2015-04-14 11:07 ` Thierry Reding
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=20150331133521.GB22683@8bytes.org \
--to=joro-zlv9swrftaidnm+yrofe0a@public.gmane.org \
--cc=gnurou-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \
--cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
--cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org \
--cc=thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.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).