Hi Dave,

On Thu, 4 Apr 2013 11:44:44 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/wireless/rt2x00/rt2x00pci.c between commit 69a2bac8984c
> ("rt2x00: rt2x00pci: fix build error on Ralink RT3x5x SoCs") from the
> wireless tree and commit 1f9061d27d3d ("drivers:net: dma_alloc_coherent:
> use __GFP_ZERO instead of memset(, 0)") from the net-next tree.
> 
> The former moved the code modified by the latter into a different file,
> so I added the following merge fix patch and can carry the fix as
> necessary (no action is required).
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 4 Apr 2013 11:42:05 +1100
> Subject: [PATCH] drivers:net: fix up for code movement from rt2x00pci.c
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/net/wireless/rt2x00/rt2x00mmio.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/net/wireless/rt2x00/rt2x00mmio.c b/drivers/net/wireless/rt2x00/rt2x00mmio.c
> index d84a680..9fe9a36 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00mmio.c
> +++ b/drivers/net/wireless/rt2x00/rt2x00mmio.c
> @@ -123,12 +123,10 @@ static int rt2x00pci_alloc_queue_dma(struct rt2x00_dev *rt2x00dev,
>  	 */
>  	addr = dma_alloc_coherent(rt2x00dev->dev,
>  				  queue->limit * queue->desc_size,
> -				  &dma, GFP_KERNEL);
> +				  &dma, GFP_KERNEL | __GFP_ZERO);
>  	if (!addr)
>  		return -ENOMEM;
>  
> -	memset(addr, 0, queue->limit * queue->desc_size);
> -
>  	/*
>  	 * Initialize all queue entries to contain valid addresses.
>  	 */

This merge fix patch seems to have got lost somewhere ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au