From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robin Murphy Subject: Re: [PATCH 0/5] Introduce per-domain page sizes Date: Mon, 9 May 2016 16:18:39 +0100 Message-ID: <5730AA4F.4040303@arm.com> References: <20160509112138.GB13275@8bytes.org> <57307863.1070706@arm.com> <20160509145157.GD13971@8bytes.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20160509145157.GD13971-zLv9SwRftAIdnm+yROfE0A@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Joerg Roedel Cc: laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org, will.deacon-5wv7dgnIgG8@public.gmane.org, dianders-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org, brian.starkey-5wv7dgnIgG8@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: iommu@lists.linux-foundation.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 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: robin.murphy@arm.com (Robin Murphy) Date: Mon, 9 May 2016 16:18:39 +0100 Subject: [PATCH 0/5] Introduce per-domain page sizes In-Reply-To: <20160509145157.GD13971@8bytes.org> References: <20160509112138.GB13275@8bytes.org> <57307863.1070706@arm.com> <20160509145157.GD13971@8bytes.org> Message-ID: <5730AA4F.4040303@arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.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 >