From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751815Ab0LFIC2 (ORCPT <rfc822;w@1wt.eu>);
	Mon, 6 Dec 2010 03:02:28 -0500
Received: from cantor.suse.de ([195.135.220.2]:51073 "EHLO mx1.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751165Ab0LFIC1 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 6 Dec 2010 03:02:27 -0500
Date: Mon, 06 Dec 2010 09:02:24 +0100
Message-ID: <s5hpqtftjlb.wl%tiwai@suse.de>
From: Takashi Iwai <tiwai@suse.de>
To: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org, Paul Mundt <lethal@linux-sh.org>
Subject: Re: linux-next: manual merge of the sound tree with the Linus' tree
In-Reply-To: <w3pd3pfg01p.wl%kuninori.morimoto.gx@renesas.com>
References: <20101206113542.b1d2f978.sfr@canb.auug.org.au>
	<w3pd3pfg01p.wl%kuninori.morimoto.gx@renesas.com>
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, 06 Dec 2010 10:30:44 +0900,
Kuninori Morimoto wrote:
> 
> 
> Dear Stephen, Takashi, Paul
> 
> > Today's linux-next merge of the sound tree got a conflict in
> > sound/soc/sh/fsi.c between commit
> > d4bc99b977e3a1dd10a84a01ebe59ac2ccebf0cd ("ARM: mach-shmobile: ap4evb:
> > FSI clock use proper process for HDMI") from Linus' tree and commit
> > 2b0e73025f74699e9cc9df60649fcc14cd02481b ("ASoC: sh: fsi: change
> > fsi->mst_ctrl to master->a/b_mclk") from the sound tree.
> (snip)
> > diff --cc sound/soc/sh/fsi.c
> > index 4c2404b,19a2f99..0000000
> > --- a/sound/soc/sh/fsi.c
> > +++ b/sound/soc/sh/fsi.c
> > @@@ -131,10 -142,6 +142,8 @@@ struct fsi_priv 
> >   
> >   	struct fsi_stream playback;
> >   	struct fsi_stream capture;
> >  +
> >  +	long rate;
> > - 
> > - 	u32 mst_ctrl;
> >   };
> >   
> >   struct fsi_core {
> 
> Oops. I'm so sorry.
> I didn't care about this conflict. sorry again.

Don't worry, such a conflict isn't your fault, but happens rather
occasionally in everywhere :)

> Above fixup is excellent

Thanks for checking!


Takashi