[alsa-devel] [PATCH 1/3] ALSA: usb: move ua101 driver

[Takashi Iwai]

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