From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Subject: Re: linux-next: manual merge of the sound tree with Linus' tree Date: Mon, 11 Apr 2011 11:05:08 +0200 Message-ID: References: <20110408143825.e15b444a.sfr@canb.auug.org.au> <20110408061630.GB21700@opensource.wolfsonmicro.com> <20110410182916.GB10486@opensource.wolfsonmicro.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Return-path: Received: from cantor2.suse.de ([195.135.220.15]:54652 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752579Ab1DKJFK (ORCPT ); Mon, 11 Apr 2011 05:05:10 -0400 In-Reply-To: <20110410182916.GB10486@opensource.wolfsonmicro.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Mark Brown Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Lucas De Marchi At Sun, 10 Apr 2011 11:29:16 -0700, Mark Brown wrote: > > On Sun, Apr 10, 2011 at 12:00:38PM +0200, Takashi Iwai wrote: > > > It'd be helpful if you can resolve in your tree. > > I'll do so whenever the next -rc comes out - I know Linus isn't fond of > people pulling random untagged commits. > > > I've been sick and can't work much since days ago. > > Oh dear, get well soon :( Thanks! Takashi