From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Wed, 14 May 2014 17:56:01 +0200 From: Joerg Roedel To: Randy Dunlap Cc: Bjorn Helgaas , Arnd Bergmann , linux-doc@vger.kernel.org, Greg Kroah-Hartman , Liviu Dudau , linux-kernel@vger.kernel.org, James Bottomley , linux-pci@vger.kernel.org, David Woodhouse Subject: Re: [PATCH v3 0/4] Clean up DMA API docs and dma_addr_t usage Message-ID: <20140514155601.GF23770@8bytes.org> References: <20140508204257.17877.4639.stgit@bhelgaas-glaptop.roam.corp.google.com> <20140514102307.GD6026@8bytes.org> <537390BE.3010307@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <537390BE.3010307@infradead.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: On Wed, May 14, 2014 at 08:50:22AM -0700, Randy Dunlap wrote: > On 05/14/2014 03:23 AM, Joerg Roedel wrote: > > On Thu, May 08, 2014 at 02:48:47PM -0600, Bjorn Helgaas wrote: > >> Maybe the third time's a charm :) > >> > >> This cleans up some DMA-API documentation and makes a minor no-op change to > >> the dma_declare_coherent_memory() prototype. > >> > >> Changes from v2: > >> - Added description of CPU virtual/physical and bus addresses in > >> DMA-API-HOWTO > >> - Added comments to sh/PCI (Dreamcast) update > >> - Dropped IOMMU interface dma_addr_t changes > >> > >> I didn't add Arnd's and Greg's acks to patch 1 because of all the new > >> address description text I added. > >> > >> --- > >> > >> Bjorn Helgaas (4): > >> DMA-API: Clarify physical/bus address distinction > >> DMA-API: Change dma_declare_coherent_memory() CPU address to phys_addr_t > >> sh/PCI: Pass GAPSPCI_DMA_BASE CPU & bus address to dma_declare_coherent_memory() > >> iommu/exynos: Remove unnecessary "&" from function pointers > > > > Applied patches 1-3 to my core branch and patch 4 to the arm/exynos > > branch. Patch 3 doesn't really belong into my tree, please let me know > > if there are any objections against it being there and I'll drop it. > > I was thinking that either Bjorn or I should merge patches 1 and 2. Okay, fine with me. Then I drop 1-3 entirely and only keep patch 4 in the exynos branch. Joerg