From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1754887AbZKBKMw@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754887AbZKBKMw (ORCPT <rfc822;w@1wt.eu>);
	Mon, 2 Nov 2009 05:12:52 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754858AbZKBKMu
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Mon, 2 Nov 2009 05:12:50 -0500
Received: from cantor.suse.de ([195.135.220.2]:47632 "EHLO mx1.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754859AbZKBKMs (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 2 Nov 2009 05:12:48 -0500
Date: Mon, 02 Nov 2009 11:12:52 +0100
Message-ID: <s5hljipxmjf.wl%tiwai@suse.de>
From: Takashi Iwai <tiwai@suse.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
       Peter Ujfalusi <peter.ujfalusi@nokia.com>,
       Mike Rapoport <mike@compulab.co.il>, Tony Lindgren <tony@atomide.com>,
       <linux-omap@vger.kernel.org>
Subject: Re: linux-next: manual merge of the sound tree with the  tree
In-Reply-To: <20091102122222.542dac88.sfr@canb.auug.org.au>
References: <20091102122222.542dac88.sfr@canb.auug.org.au>
User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka)
 FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.1
 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

At Mon, 2 Nov 2009 12:22:22 +1100,
Stephen Rothwell wrote:
> 
> Hi Takashi,
> 
> Today's linux-next merge of the sound tree got a conflict in
> arch/arm/mach-omap2/board-omap3evm.c between commit
> fa48a99192e3ee862f6d26c5248347c772b33b84 ("omap3: evm: initialize vmmc
> and vmmc_aux regulators") from the omap tree and commit
> f8d9aad96d0d7b57d0bf2e4de21fdda3a42f4449 ("OMAP: Platform support for
> twl4030_codec MFD") from the sound tree.
> 
> Just overlapping additions.  I fixed it up (see below) and can carry the
> fix as necessary.

Thanks Stephen.

Since this is a simple conflict, as now I'll keep sound tree as is.
Let me know if any severe conflict comes out.


thanks,

Takashi

> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc arch/arm/mach-omap2/board-omap3evm.c
> index 660ef8c,d9a6103..0000000
> --- a/arch/arm/mach-omap2/board-omap3evm.c
> +++ b/arch/arm/mach-omap2/board-omap3evm.c
> @@@ -247,8 -211,7 +255,9 @@@ static struct twl4030_platform_data oma
>   	.madc		= &omap3evm_madc_data,
>   	.usb		= &omap3evm_usb_data,
>   	.gpio		= &omap3evm_gpio_data,
>  +	.vmmc1		= &omap3evm_vmmc1,
>  +	.vsim		= &omap3evm_vsim,
> + 	.codec		= &omap3evm_codec_data,
>   };
>   
>   static struct i2c_board_info __initdata omap3evm_i2c_boardinfo[] = {
>