diff for duplicates of <20180112132516.GD26900@localhost.localdomain> diff --git a/a/1.txt b/N1/1.txt index 0762b68..2997c59 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -53,8 +53,8 @@ Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > struct dev_archdata __maybe_unused *sd = &dev->archdata; > > #ifdef CONFIG_SWIOTLB -> - if (sd->max_direct_dma_addr && dev->dma_ops == &swiotlb_dma_ops) -> + if (sd->max_direct_dma_addr && dev->dma_ops == &powerpc_swiotlb_dma_ops) +> - if (sd->max_direct_dma_addr && dev->dma_ops = &swiotlb_dma_ops) +> + if (sd->max_direct_dma_addr && dev->dma_ops = &powerpc_swiotlb_dma_ops) > pfn = min_t(u64, pfn, sd->max_direct_dma_addr >> PAGE_SHIFT); > #endif > diff --git a/a/content_digest b/N1/content_digest index 8fd02d9..09ff41e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020180110080932.14157-5-hch@lst.de\0" "From\0Konrad Rzeszutek Wilk <konrad@darnok.org>\0" "Subject\0Re: [PATCH 04/22] powerpc: rename swiotlb_dma_ops\0" - "Date\0Fri, 12 Jan 2018 08:25:17 -0500\0" + "Date\0Fri, 12 Jan 2018 13:25:17 +0000\0" "To\0Christoph Hellwig <hch@lst.de>\0" "Cc\0iommu@lists.linux-foundation.org" Michal Simek <monstr@monstr.eu> @@ -72,8 +72,8 @@ "> \tstruct dev_archdata __maybe_unused *sd = &dev->archdata;\n" "> \n" "> #ifdef CONFIG_SWIOTLB\n" - "> -\tif (sd->max_direct_dma_addr && dev->dma_ops == &swiotlb_dma_ops)\n" - "> +\tif (sd->max_direct_dma_addr && dev->dma_ops == &powerpc_swiotlb_dma_ops)\n" + "> -\tif (sd->max_direct_dma_addr && dev->dma_ops = &swiotlb_dma_ops)\n" + "> +\tif (sd->max_direct_dma_addr && dev->dma_ops = &powerpc_swiotlb_dma_ops)\n" "> \t\tpfn = min_t(u64, pfn, sd->max_direct_dma_addr >> PAGE_SHIFT);\n" "> #endif\n" "> \n" @@ -94,4 +94,4 @@ "> 2.14.2\n" > -b4af45e98e6efcddcaa9600a7a4541b404744f5ae82c01396b36b1664fba186a +6bd6d46383a40f86cf99f17dda0b0de61f54582d31292ec7de09fec4599fb293
diff --git a/a/content_digest b/N2/content_digest index 8fd02d9..d7b5892 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,20 +1,9 @@ "ref\020180110080932.14157-1-hch@lst.de\0" "ref\020180110080932.14157-5-hch@lst.de\0" - "From\0Konrad Rzeszutek Wilk <konrad@darnok.org>\0" - "Subject\0Re: [PATCH 04/22] powerpc: rename swiotlb_dma_ops\0" + "From\0konrad@darnok.org (Konrad Rzeszutek Wilk)\0" + "Subject\0[PATCH 04/22] powerpc: rename swiotlb_dma_ops\0" "Date\0Fri, 12 Jan 2018 08:25:17 -0500\0" - "To\0Christoph Hellwig <hch@lst.de>\0" - "Cc\0iommu@lists.linux-foundation.org" - Michal Simek <monstr@monstr.eu> - Guan Xuetao <gxt@mprc.pku.edu.cn> - " Christian K\303\266nig <ckoenig.leichtzumerken@gmail.com>" - linux-arm-kernel@lists.infradead.org - linux-ia64@vger.kernel.org - linux-mips@linux-mips.org - linuxppc-dev@lists.ozlabs.org - x86@kernel.org - linux-arch@vger.kernel.org - " linux-kernel@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Wed, Jan 10, 2018 at 09:09:14AM +0100, Christoph Hellwig wrote:\n" @@ -94,4 +83,4 @@ "> 2.14.2\n" > -b4af45e98e6efcddcaa9600a7a4541b404744f5ae82c01396b36b1664fba186a +c28c97614278915eff68137f50e6851ac05c94a2179031b6c39c1017cb07b27f
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.