From: robin.murphy@arm•com (Robin Murphy)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 0/5] Introduce per-domain page sizes
Date: Mon, 9 May 2016 16:18:39 +0100 [thread overview]
Message-ID: <5730AA4F.4040303@arm.com> (raw)
In-Reply-To: <20160509145157.GD13971@8bytes.org>
On 09/05/16 15:51, Joerg Roedel wrote:
> On Mon, May 09, 2016 at 12:45:39PM +0100, Robin Murphy wrote:
>> Thanks a lot! I was expecting to pick this up again after the merge
>> window and post an updated version then; as you may already have
>> found, patch 5 conflicts somewhat with the SMMUv2 context format
>> changes in Will's updates branch. The correct resolution requires a
>> bit of rewriting, so below is what that patch looks like when
>> rebased on top of Will's branch. If you'd prefer it in actual merge
>> resolution format, shout and I'll give that a go.
>
> Okay, hmm, but the patch does not apply here, even after fixing the line
> breaks. I'll push my tree soon, can you rebase this patch on-top the
> core branch then? It should already contain patches 1-4.
Bah, I saw last week's "Merge remote-tracking branch
'will/for-joerg/arm-smmu/updates' into HEAD" commit on that branch
without spotting it was no longer up to date, sorry. Yes, it's probably
safest if I rebase on top of your merge of everything else - I'll keep
an eye out.
Thanks,
Robin.
>
>
> Joerg
>
next prev parent reply other threads:[~2016-05-09 15:18 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-07 17:42 [PATCH 0/5] Introduce per-domain page sizes Robin Murphy
2016-04-07 17:42 ` [PATCH 1/5] iommu: remove unused priv field from struct iommu_ops Robin Murphy
2016-04-07 17:42 ` [PATCH 2/5] iommu: of: enforce const-ness of " Robin Murphy
2016-04-07 17:42 ` [PATCH 3/5] iommu: Allow selecting page sizes per domain Robin Murphy
2016-04-07 17:42 ` [PATCH 4/5] iommu/dma: Finish optimising higher-order allocations Robin Murphy
2016-04-08 5:32 ` Yong Wu
2016-04-08 16:33 ` Robin Murphy
2016-04-13 16:29 ` [PATCH v2] " Robin Murphy
2016-04-21 5:47 ` Yong Wu
2016-04-07 17:42 ` [PATCH 5/5] iommu/arm-smmu: Use per-domain page sizes Robin Murphy
2016-05-09 16:20 ` [PATCH v2] " Robin Murphy
2016-05-10 9:45 ` Joerg Roedel
2016-04-21 16:38 ` [PATCH 0/5] Introduce " Will Deacon
2016-05-09 11:21 ` Joerg Roedel
2016-05-09 11:45 ` Robin Murphy
2016-05-09 14:51 ` Joerg Roedel
2016-05-09 15:18 ` Robin Murphy [this message]
2016-05-09 15:50 ` 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=5730AA4F.4040303@arm.com \
--to=robin.murphy@arm$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/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