diff for duplicates of <20180110154649.GA18529@lst.de> diff --git a/a/1.txt b/N1/1.txt index 2effa5b..690a4a2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,5 +1,5 @@ On Wed, Jan 10, 2018 at 12:22:18PM +0000, Robin Murphy wrote: ->> + if (phys_addr == SWIOTLB_MAP_ERROR) +>> + if (phys_addr = SWIOTLB_MAP_ERROR) >> + goto out_warn; >> - /* Confirm address can be DMA'd by device */ >> - if (dev_addr + size - 1 > dma_mask) { diff --git a/a/content_digest b/N1/content_digest index 89ed56a..dd8e459 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\0cecc98cf-2e6a-a7bc-7390-d6dcced038c4@arm.com\0" "From\0Christoph Hellwig <hch@lst.de>\0" "Subject\0Re: [PATCH 10/22] swiotlb: refactor coherent buffer allocation\0" - "Date\0Wed, 10 Jan 2018 16:46:49 +0100\0" + "Date\0Wed, 10 Jan 2018 15:46:49 +0000\0" "To\0Robin Murphy <robin.murphy@arm.com>\0" "Cc\0Christoph Hellwig <hch@lst.de>" iommu@lists.linux-foundation.org @@ -21,7 +21,7 @@ "\00:1\0" "b\0" "On Wed, Jan 10, 2018 at 12:22:18PM +0000, Robin Murphy wrote:\n" - ">> +\tif (phys_addr == SWIOTLB_MAP_ERROR)\n" + ">> +\tif (phys_addr = SWIOTLB_MAP_ERROR)\n" ">> +\t\tgoto out_warn;\n" ">> -\t\t/* Confirm address can be DMA'd by device */\n" ">> -\t\tif (dev_addr + size - 1 > dma_mask) {\n" @@ -58,4 +58,4 @@ "Yes, that free_pages got lost somewhere in the rebases, I've added\n" it back. -6758b6201511a5739c030d9c2e6ffc454a544ebe1eaf7a68070537d807597475 +a8061204af4376e1f9d48e934d4d2643926567da9bc8e632dfdfaf45c140cee5
diff --git a/a/content_digest b/N2/content_digest index 89ed56a..eb2eaaf 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,23 +1,10 @@ "ref\020180110080932.14157-1-hch@lst.de\0" "ref\020180110080932.14157-11-hch@lst.de\0" "ref\0cecc98cf-2e6a-a7bc-7390-d6dcced038c4@arm.com\0" - "From\0Christoph Hellwig <hch@lst.de>\0" - "Subject\0Re: [PATCH 10/22] swiotlb: refactor coherent buffer allocation\0" + "From\0hch@lst.de (Christoph Hellwig)\0" + "Subject\0[PATCH 10/22] swiotlb: refactor coherent buffer allocation\0" "Date\0Wed, 10 Jan 2018 16:46:49 +0100\0" - "To\0Robin Murphy <robin.murphy@arm.com>\0" - "Cc\0Christoph Hellwig <hch@lst.de>" - iommu@lists.linux-foundation.org - linux-arch@vger.kernel.org - linux-mips@linux-mips.org - Michal Simek <monstr@monstr.eu> - linux-ia64@vger.kernel.org - " Christian K\303\266nig <ckoenig.leichtzumerken@gmail.com>" - x86@kernel.org - linux-kernel@vger.kernel.org - Konrad Rzeszutek Wilk <konrad@darnok.org> - Guan Xuetao <gxt@mprc.pku.edu.cn> - linuxppc-dev@lists.ozlabs.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Wed, Jan 10, 2018 at 12:22:18PM +0000, Robin Murphy wrote:\n" @@ -58,4 +45,4 @@ "Yes, that free_pages got lost somewhere in the rebases, I've added\n" it back. -6758b6201511a5739c030d9c2e6ffc454a544ebe1eaf7a68070537d807597475 +bb7fc7763ca9aa5dfbde8679d9bc1991e4b19f8b3b2aa3a6ac1666e736291ddb
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.