From: Takashi Iwai Subject: Re: [PATCH 1/3] ALSA: usb: move ua101 driver Date: Thu, 04 Mar 2010 16:43:42 +0100 Message-ID: References: <1267194883-6854-1-git-send-email-daniel@caiaq.de> <1267194883-6854-2-git-send-email-daniel@caiaq.de> <4B8BA4A3.1060506@ladisch.de> <20100301140129.GI28972@buzzloop.caiaq.de> <20100301141848.GJ28972@buzzloop.caiaq.de> <20100304151627.GY9007@buzzloop.caiaq.de> <20100304153834.GK28972@buzzloop.caiaq.de> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 7CFFD103841 for ; Thu, 4 Mar 2010 16:43:42 +0100 (CET) In-Reply-To: <20100304153834.GK28972@buzzloop.caiaq.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: Daniel Mack Cc: alsa-devel@alsa-project.org, Clemens Ladisch List-Id: alsa-devel@alsa-project.org At Thu, 4 Mar 2010 16:38:34 +0100, Daniel Mack wrote: > > On Thu, Mar 04, 2010 at 04:31:19PM +0100, Takashi Iwai wrote: > > Daniel Mack wrote: > > > > > > Any plan on when to do that? I'm not in a hurry really, but I see the > > > usbaudio driver moving on, so merging would need some manual backporting > > > already. I can do that if you want and prepare a new patchset. > > > > You can prepare patches based on topic/misc branch of sound git tree, > > git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git topic/misc > > > > or base on the latest Linus tree, which already contains USB audio v2.0 > > patches. > > > > Then I'll create a separate branch (maybe again topic/usb-v2.0) and > > apply your patches, keep separate from linux-next branch. > > Ok, will do. However, I wonder how new patches to the usbaudio driver > will be handled then until the branch is merged? They are merged back to topic/usb-v2.0 branch. Conflicts are solved manually at merges. Takashi