From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <galak@kernel.crashing.org>
Received: from gate.crashing.org (gate.crashing.org [63.228.1.57])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client did not present a certificate)
	by ozlabs.org (Postfix) with ESMTPS id 8ABC0DDEEB
	for <linuxppc-dev@ozlabs.org>; Mon, 29 Sep 2008 23:12:18 +1000 (EST)
Message-Id: <295973D9-5AD2-47A3-B858-CED501169D86@kernel.crashing.org>
From: Kumar Gala <galak@kernel.crashing.org>
To: Paul Mackerras <paulus@samba.org>
In-Reply-To: <Pine.LNX.4.64.0809241652540.22678@blarg.am.freescale.net>
Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes
Mime-Version: 1.0 (Apple Message framework v929.2)
Subject: Re: Please pull from 'dma' branch
Date: Mon, 29 Sep 2008 08:12:11 -0500
References: <Pine.LNX.4.64.0809241652540.22678@blarg.am.freescale.net>
Cc: linuxppc-dev list <linuxppc-dev@ozlabs.org>
List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.ozlabs.org>
List-Unsubscribe: <https://ozlabs.org/mailman/options/linuxppc-dev>,
	<mailto:linuxppc-dev-request@ozlabs.org?subject=unsubscribe>
List-Archive: <http://ozlabs.org/pipermail/linuxppc-dev>
List-Post: <mailto:linuxppc-dev@ozlabs.org>
List-Help: <mailto:linuxppc-dev-request@ozlabs.org?subject=help>
List-Subscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-dev>,
	<mailto:linuxppc-dev-request@ozlabs.org?subject=subscribe>


On Sep 24, 2008, at 4:54 PM, Kumar Gala wrote:

> Please pull from 'dma' branch of
>
> (forgot linuxppc-dev on first go around)
>
> 	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git dma
>
> to receive the following updates:
>
> arch/powerpc/include/asm/device.h       |    3
> arch/powerpc/include/asm/dma-mapping.h  |  187 ++++++++ 
> +--------------------
> arch/powerpc/include/asm/machdep.h      |    5
> arch/powerpc/include/asm/pci.h          |   14 +-
> arch/powerpc/include/asm/types.h        |    2
> arch/powerpc/kernel/Makefile            |    4
> arch/powerpc/kernel/dma-iommu.c         |  103 ++++++++++++++++
> arch/powerpc/kernel/dma.c               |  127 ++++++++++++++++++++
> arch/powerpc/kernel/dma_64.c            |  200  
> --------------------------------
> arch/powerpc/kernel/of_device.c         |    2
> arch/powerpc/kernel/pci-common.c        |   48 +++++++
> arch/powerpc/kernel/pci_32.c            |    7 +
> arch/powerpc/kernel/pci_64.c            |   49 -------
> arch/powerpc/kernel/vio.c               |    2
> arch/powerpc/platforms/cell/iommu.c     |    6
> arch/powerpc/platforms/ps3/system-bus.c |    2
> 16 files changed, 366 insertions(+), 395 deletions(-)
>
> Becky Bruce (5):
>      powerpc: Rename dma_64.c to dma.c
>      powerpc: Move iommu dma ops from dma.c to dma-iommu.c
>      powerpc: Drop archdata numa_node
>      powerpc: Merge 32 and 64-bit dma code
>      powerpc: Make dma_addr_t a u64 if CONFIG_PHYS_64BIT is set

Paul,

poke..

- k