diff for duplicates of <20181019065258.GA29249@lst.de> diff --git a/a/1.txt b/N1/1.txt index a3adc5c..9b8a93b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,12 +9,12 @@ On Thu, Oct 18, 2018 at 08:37:15PM -0400, Konrad Rzeszutek Wilk wrote: > > here, which also then allows a tail-call to swiotlb_bounce_page() (and saves > > a couple of lines), but it's no biggie. > > -> > Reviewed-by: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org> +> > Reviewed-by: Robin Murphy <robin.murphy@arm.com> > > I agree with Robin - it certainly makes it easier to read. > > With that small change: -> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> +> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> So I did this edit, and in this patch it does indeed look much cleaner. But in patch 9 we introduce the cache maintainance, and have to invert @@ -22,7 +22,7 @@ the condition again if we don't want a goto mess: --- >From e840ec23360788d54a8ebd2ebc7cd0f0ef8bdb01 Mon Sep 17 00:00:00 2001 -From: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> +From: Christoph Hellwig <hch@lst.de> Date: Fri, 19 Oct 2018 08:51:53 +0200 Subject: swiotlb: add support for non-coherent DMA @@ -35,7 +35,7 @@ Because swiotlb now uses dma_direct_alloc for the coherent allocation that side is already taken care of by the dma-direct code calling into arch_dma_{alloc,free} for devices that are non-coherent. -Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> +Signed-off-by: Christoph Hellwig <hch@lst.de> --- kernel/dma/swiotlb.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/a/content_digest b/N1/content_digest index c0e0740..b4a7f1c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,18 +2,10 @@ "ref\020181008080246.20543-8-hch@lst.de\0" "ref\035016142-f06d-e424-5afe-6026b6d57eda@arm.com\0" "ref\020181019003715.GI1251@char.us.oracle.com\0" - "ref\020181019003715.GI1251-he5eyhs8q0BAdwtm4QZOy9BPR1lH4CV8@public.gmane.org\0" - "From\0Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>\0" - "Subject\0Re: [PATCH 07/10] swiotlb: refactor swiotlb_map_page\0" + "From\0hch@lst.de (Christoph Hellwig)\0" + "Subject\0[PATCH 07/10] swiotlb: refactor swiotlb_map_page\0" "Date\0Fri, 19 Oct 2018 08:52:58 +0200\0" - "To\0Konrad Rzeszutek Wilk <konrad.wilk-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>\0" - "Cc\0Catalin Marinas <catalin.marinas-5wv7dgnIgG8@public.gmane.org>" - Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org> - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org - Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org> - Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> - " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Thu, Oct 18, 2018 at 08:37:15PM -0400, Konrad Rzeszutek Wilk wrote:\n" @@ -27,12 +19,12 @@ "> > here, which also then allows a tail-call to swiotlb_bounce_page() (and saves\n" "> > a couple of lines), but it's no biggie.\n" "> > \n" - "> > Reviewed-by: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>\n" + "> > Reviewed-by: Robin Murphy <robin.murphy@arm.com>\n" "> \n" "> I agree with Robin - it certainly makes it easier to read.\n" "> \n" "> With that small change:\n" - "> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>\n" + "> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>\n" "\n" "So I did this edit, and in this patch it does indeed look much cleaner.\n" "But in patch 9 we introduce the cache maintainance, and have to invert\n" @@ -40,7 +32,7 @@ "\n" "---\n" ">From e840ec23360788d54a8ebd2ebc7cd0f0ef8bdb01 Mon Sep 17 00:00:00 2001\n" - "From: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>\n" + "From: Christoph Hellwig <hch@lst.de>\n" "Date: Fri, 19 Oct 2018 08:51:53 +0200\n" "Subject: swiotlb: add support for non-coherent DMA\n" "\n" @@ -53,7 +45,7 @@ "that side is already taken care of by the dma-direct code calling into\n" "arch_dma_{alloc,free} for devices that are non-coherent.\n" "\n" - "Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>\n" + "Signed-off-by: Christoph Hellwig <hch@lst.de>\n" "---\n" " kernel/dma/swiotlb.c | 33 +++++++++++++++++++++++----------\n" " 1 file changed, 23 insertions(+), 10 deletions(-)\n" @@ -130,4 +122,4 @@ "-- \n" 2.19.1 -2d4949a240536259ca537e38601d5e299b5405e3dc9455c416cf9ea8fd1b848b +f538454aa98c047118bf31484446b791d595cb199ad50c46537b9c5726ddb208
diff --git a/a/1.txt b/N2/1.txt index a3adc5c..196a10e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -9,20 +9,20 @@ On Thu, Oct 18, 2018 at 08:37:15PM -0400, Konrad Rzeszutek Wilk wrote: > > here, which also then allows a tail-call to swiotlb_bounce_page() (and saves > > a couple of lines), but it's no biggie. > > -> > Reviewed-by: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org> +> > Reviewed-by: Robin Murphy <robin.murphy@arm.com> > > I agree with Robin - it certainly makes it easier to read. > > With that small change: -> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> +> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> So I did this edit, and in this patch it does indeed look much cleaner. But in patch 9 we introduce the cache maintainance, and have to invert the condition again if we don't want a goto mess: --- ->From e840ec23360788d54a8ebd2ebc7cd0f0ef8bdb01 Mon Sep 17 00:00:00 2001 -From: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> +From e840ec23360788d54a8ebd2ebc7cd0f0ef8bdb01 Mon Sep 17 00:00:00 2001 +From: Christoph Hellwig <hch@lst.de> Date: Fri, 19 Oct 2018 08:51:53 +0200 Subject: swiotlb: add support for non-coherent DMA @@ -35,7 +35,7 @@ Because swiotlb now uses dma_direct_alloc for the coherent allocation that side is already taken care of by the dma-direct code calling into arch_dma_{alloc,free} for devices that are non-coherent. -Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> +Signed-off-by: Christoph Hellwig <hch@lst.de> --- kernel/dma/swiotlb.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/a/content_digest b/N2/content_digest index c0e0740..704e652 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,18 +2,17 @@ "ref\020181008080246.20543-8-hch@lst.de\0" "ref\035016142-f06d-e424-5afe-6026b6d57eda@arm.com\0" "ref\020181019003715.GI1251@char.us.oracle.com\0" - "ref\020181019003715.GI1251-he5eyhs8q0BAdwtm4QZOy9BPR1lH4CV8@public.gmane.org\0" - "From\0Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>\0" + "From\0Christoph Hellwig <hch@lst.de>\0" "Subject\0Re: [PATCH 07/10] swiotlb: refactor swiotlb_map_page\0" "Date\0Fri, 19 Oct 2018 08:52:58 +0200\0" - "To\0Konrad Rzeszutek Wilk <konrad.wilk-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>\0" - "Cc\0Catalin Marinas <catalin.marinas-5wv7dgnIgG8@public.gmane.org>" - Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org> - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org - Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org> - Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> - " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" + "To\0Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>\0" + "Cc\0Robin Murphy <robin.murphy@arm.com>" + Christoph Hellwig <hch@lst.de> + Will Deacon <will.deacon@arm.com> + Catalin Marinas <catalin.marinas@arm.com> + linux-arm-kernel@lists.infradead.org + iommu@lists.linux-foundation.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On Thu, Oct 18, 2018 at 08:37:15PM -0400, Konrad Rzeszutek Wilk wrote:\n" @@ -27,20 +26,20 @@ "> > here, which also then allows a tail-call to swiotlb_bounce_page() (and saves\n" "> > a couple of lines), but it's no biggie.\n" "> > \n" - "> > Reviewed-by: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>\n" + "> > Reviewed-by: Robin Murphy <robin.murphy@arm.com>\n" "> \n" "> I agree with Robin - it certainly makes it easier to read.\n" "> \n" "> With that small change:\n" - "> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>\n" + "> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>\n" "\n" "So I did this edit, and in this patch it does indeed look much cleaner.\n" "But in patch 9 we introduce the cache maintainance, and have to invert\n" "the condition again if we don't want a goto mess:\n" "\n" "---\n" - ">From e840ec23360788d54a8ebd2ebc7cd0f0ef8bdb01 Mon Sep 17 00:00:00 2001\n" - "From: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>\n" + "From e840ec23360788d54a8ebd2ebc7cd0f0ef8bdb01 Mon Sep 17 00:00:00 2001\n" + "From: Christoph Hellwig <hch@lst.de>\n" "Date: Fri, 19 Oct 2018 08:51:53 +0200\n" "Subject: swiotlb: add support for non-coherent DMA\n" "\n" @@ -53,7 +52,7 @@ "that side is already taken care of by the dma-direct code calling into\n" "arch_dma_{alloc,free} for devices that are non-coherent.\n" "\n" - "Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>\n" + "Signed-off-by: Christoph Hellwig <hch@lst.de>\n" "---\n" " kernel/dma/swiotlb.c | 33 +++++++++++++++++++++++----------\n" " 1 file changed, 23 insertions(+), 10 deletions(-)\n" @@ -130,4 +129,4 @@ "-- \n" 2.19.1 -2d4949a240536259ca537e38601d5e299b5405e3dc9455c416cf9ea8fd1b848b +409b55fb11f2f5fdae9c442dad7f3aeaa2300b8297c02d190fee684fc6587c2b
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.