ALSA conflicts with 3.2.9 stable

[Leann Ogasawara]

On Thu, 2012-03-01 at 06:44 +0100, David Henningsson wrote:
> On 03/01/2012 04:50 AM, Tim Gardner wrote:
> > David - the Precise rebase against 3.2.9 stable is causing some compile
> > issues with the jack detection patches. In order to keep things building
> > correctly I've simply ripped out all of the driver/sound/hda patches
> > that appear after v3.2.9 and pushed that to master-next. I created a
> > branch for you that exhibits the compile issues in master-next-alsa. If
> > you would, please sort these jack detection patches and propose a pull
> > request against master-next. Thanks.
> >
> > git://kernel.ubuntu.com/ubuntu/ubuntu-precise.git master-next-alsa
> 
> Hi,
> 
> This commit should be reverted:
> 
>  From 2a8e5e8a2df18812c60720fa0534c29c9f1c17b6 Mon Sep 17 00:00:00 2001
> From: Takashi Iwai <tiwai at suse.de>
> Date: Wed, 22 Feb 2012 17:02:38 +0100
> Subject: [PATCH] ALSA: hda - Fix redundant jack creations for cx5051
> 
> As the patch commit text says,
> "The fix is needed only up to 3.2 kernel, since the HD-audio jack layer
> was redesigned in the 3.3 kernel."
> 
> As we carry that redesigned jack layer, the problem addressed by this 
> patch does not apply to our kernel.
> 
> Moreover, it seems like one of my patches (ALSA: hda - Integrate 
> input-jack stuff into kctl-jack) was modified somehow in this branch to 
> make it apply, it seems easier for everybody if I just tell you what to 
> do instead of trying to sort that out, which is to:
> 
> 1) Start with the 3.2.9 tree
> 2) Revert 2a8e5e8a2df18812c60720fa0534c29c9f1c17b6
> 3) Rebase on the result, i e, re-apply the jack detection patches (in 
> their unmodified versions), together with all the other Ubuntu changes.
> 
> Does that make sense?

Yep, thanks.  I've gone ahead and cleaned this up per David's
instructions and re-pushed to master-next.

Thanks,
Leann