From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756060Ab1DJKAl (ORCPT ); Sun, 10 Apr 2011 06:00:41 -0400 Received: from cantor.suse.de ([195.135.220.2]:49261 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752548Ab1DJKAk (ORCPT ); Sun, 10 Apr 2011 06:00:40 -0400 Date: Sun, 10 Apr 2011 12:00:38 +0200 Message-ID: From: Takashi Iwai To: Mark Brown Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Lucas De Marchi Subject: Re: linux-next: manual merge of the sound tree with Linus' tree In-Reply-To: <20110408061630.GB21700@opensource.wolfsonmicro.com> References: <20110408143825.e15b444a.sfr@canb.auug.org.au> <20110408061630.GB21700@opensource.wolfsonmicro.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.2 (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: X-Mailing-List: linux-kernel@vger.kernel.org At Fri, 8 Apr 2011 07:16:30 +0100, Mark Brown wrote: > > On Fri, Apr 08, 2011 at 02:38:25PM +1000, Stephen Rothwell wrote: > > > Today's linux-next merge of the sound tree got a conflict in > > sound/soc/codecs/wm8994.c between commit 25985edcedea ("Fix common > > misspellings") from Linus' tree and commit f701a2e594e6 ("ASoC: Factor > > WM8958 DSP2 handling into separate file") from the sound tree. > > > The latter moved the code changed by the former into another file. I did > > not bother fixing the spelling errors there. > > I guess I'll fix this by merging up next time there's a -rc. Not sure > why such patches aren't getting done against -next, though. It'd be helpful if you can resolve in your tree. I've been sick and can't work much since days ago. thanks, Takashi