diff for duplicates of <653ca801-63a1-3c19-ee09-ade19fa2bbb8@arm.com> diff --git a/a/1.txt b/N1/1.txt index 721e6ff..a1db230 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -37,7 +37,7 @@ On 30/11/2018 13:22, Christoph Hellwig wrote: > > debug_dma_mapping_error(dev, dma_addr); > + -> + if (dma_addr == DMA_MAPPING_ERROR) +> + if (dma_addr = DMA_MAPPING_ERROR) > + return 1; > + > if (ops->mapping_error) @@ -47,7 +47,7 @@ On 30/11/2018 13:22, Christoph Hellwig wrote: I'd have been inclined to put the default check here, i.e. - return 0 -+ return dma_addr == DMA_MAPPING_ERROR ++ return dma_addr = DMA_MAPPING_ERROR such that the callback retains full precedence and we don't have to deal with the non-trivial removals immediately if it comes to it. Not that it diff --git a/a/content_digest b/N1/content_digest index 4f05d28..f87b95a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020181130132231.16512-2-hch@lst.de\0" "From\0Robin Murphy <robin.murphy@arm.com>\0" "Subject\0Re: [PATCH 01/23] dma-mapping: provide a generic DMA_MAPPING_ERROR\0" - "Date\0Tue, 4 Dec 2018 16:41:34 +0000\0" + "Date\0Tue, 04 Dec 2018 16:41:34 +0000\0" "To\0Christoph Hellwig <hch@lst.de>" " iommu@lists.linux-foundation.org\0" "Cc\0linux-arch@vger.kernel.org" @@ -56,7 +56,7 @@ "> \n" "> \tdebug_dma_mapping_error(dev, dma_addr);\n" "> +\n" - "> +\tif (dma_addr == DMA_MAPPING_ERROR)\n" + "> +\tif (dma_addr = DMA_MAPPING_ERROR)\n" "> +\t\treturn 1;\n" "> +\n" "> \tif (ops->mapping_error)\n" @@ -66,7 +66,7 @@ "I'd have been inclined to put the default check here, i.e.\n" "\n" "-\treturn 0\n" - "+\treturn dma_addr == DMA_MAPPING_ERROR\n" + "+\treturn dma_addr = DMA_MAPPING_ERROR\n" "\n" "such that the callback retains full precedence and we don't have to deal \n" "with the non-trivial removals immediately if it comes to it. Not that it \n" @@ -74,4 +74,4 @@ "\n" Reviewed-by: Robin Murphy <robin.murphy@arm.com> -6db0b070cf01b5752800c4ec15196a61dec2c066170d6e3520be6c7c4da8f0c1 +4cf2ef83ab844c4a68760ba2bd8081be1dbbef1b12329a1fd827cbe2605aa53e
diff --git a/a/1.txt b/N2/1.txt index 721e6ff..4a723d7 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -54,3 +54,8 @@ with the non-trivial removals immediately if it comes to it. Not that it makes a vast difference though, so either way, Reviewed-by: Robin Murphy <robin.murphy@arm.com> + +_______________________________________________ +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N2/content_digest index 4f05d28..eaf0583 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -6,14 +6,14 @@ "To\0Christoph Hellwig <hch@lst.de>" " iommu@lists.linux-foundation.org\0" "Cc\0linux-arch@vger.kernel.org" - linux-alpha@vger.kernel.org linux-ia64@vger.kernel.org linux-parisc@vger.kernel.org - Linus Torvalds <torvalds@linux-foundation.org> + David Woodhouse <dwmw2@infradead.org> x86@kernel.org linux-kernel@vger.kernel.org + linux-alpha@vger.kernel.org xen-devel@lists.xenproject.org - David Woodhouse <dwmw2@infradead.org> + Linus Torvalds <torvalds@linux-foundation.org> " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -72,6 +72,11 @@ "with the non-trivial removals immediately if it comes to it. Not that it \n" "makes a vast difference though, so either way,\n" "\n" - Reviewed-by: Robin Murphy <robin.murphy@arm.com> + "Reviewed-by: Robin Murphy <robin.murphy@arm.com>\n" + "\n" + "_______________________________________________\n" + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -6db0b070cf01b5752800c4ec15196a61dec2c066170d6e3520be6c7c4da8f0c1 +05e7ae37d01b20f957630100492b472130f33f86850ed74ee5392850d8586a2a
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.