Patchwork UBUNTU: (pre-stable) Natty: Quirk for Lenovo X220-tablet

login
register
mail settings
Submitter David Henningsson
Date April 5, 2011, 6:52 p.m.
Message ID <4D9B6506.40309@canonical.com>
Download mbox | patch
Permalink /patch/89920/
State New
Headers show

Comments

David Henningsson - April 5, 2011, 6:52 p.m.
I'm not sure this quirk will reach Natty if it goes the ordinary path, 
so let's pre-stable it. I think 840126579da56edae8ecc4a0d85198f742982f10 
is already in, right? Otherwise that one should also be picked, and 
before the attached one.
Tim Gardner - April 5, 2011, 7:08 p.m.
On 04/05/2011 12:52 PM, David Henningsson wrote:
> I'm not sure this quirk will reach Natty if it goes the ordinary path,
> so let's pre-stable it. I think 840126579da56edae8ecc4a0d85198f742982f10
> is already in, right? Otherwise that one should also be picked, and
> before the attached one.
>

Is there a reason it might not be acceptable for stable?

I've applied 840126579da56edae8ecc4a0d85198f742982f10 to Natty, but the 
second patch is not yet in Linus' tree. Please bug me when it gets merged.

In the future it would be nice if you specified to which stable kernels 
you would like your patch applied. We have 3 right now.

rtg
David Henningsson - April 5, 2011, 7:18 p.m.
On 2011-04-05 21:08, Tim Gardner wrote:
> On 04/05/2011 12:52 PM, David Henningsson wrote:
>> I'm not sure this quirk will reach Natty if it goes the ordinary path,
>> so let's pre-stable it. I think 840126579da56edae8ecc4a0d85198f742982f10
>> is already in, right? Otherwise that one should also be picked, and
>> before the attached one.
>
> Is there a reason it might not be acceptable for stable?

No, this is just a matter of speed, and making sure the patch is in 
before Natty kernel freeze. That's what I meant with "reach Natty", 
sorry if that was unclear.

> I've applied 840126579da56edae8ecc4a0d85198f742982f10 to Natty, but the
> second patch is not yet in Linus' tree. Please bug me when it gets merged.

The question is, will it be before we freeze Natty's kernel?

> In the future it would be nice if you specified to which stable kernels
> you would like your patch applied. We have 3 right now.

That's why the subject line says "Natty". For the other ones, it can 
take the slow path through upstream stable.
Tim Gardner - April 6, 2011, 12:59 p.m.
On 04/05/2011 12:52 PM, David Henningsson wrote:
> I'm not sure this quirk will reach Natty if it goes the ordinary path,
> so let's pre-stable it. I think 840126579da56edae8ecc4a0d85198f742982f10
> is already in, right? Otherwise that one should also be picked, and
> before the attached one.
>

applied
Tim Gardner - April 6, 2011, 1:13 p.m.
On 04/05/2011 01:18 PM, David Henningsson wrote:
>
> That's why the subject line says "Natty". For the other ones, it can
> take the slow path through upstream stable.
>
>

Actually, my point was that you should specify in the commit log on the 
'Cc: stable@kernel.org' line to which kernel versions this patch 
applies. For example,

Cc: stable@kernel.org [2.6.37+]

It takes the guess work out for the stable maintainers and eases their 
workload. After all, you (the patch originator) know best which kernel 
versions you're affecting.

rtg

Patch

From b2cb1292b1c7c73abbdc0e07ef3aab056fc2615f Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
Date: Tue, 5 Apr 2011 07:55:24 +0200
Subject: [PATCH] ALSA: HDA: Fix dock mic for Lenovo X220-tablet

Without the "thinkpad" quirk, the dock mic in
Lenovo X220 tablet edition won't work.

BugLink: http://bugs.launchpad.net/bugs/751033
Cc: stable@kernel.org
Tested-by: James Ferguson <james.ferguson@canonical.com>
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/pci/hda/patch_conexant.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 69e3386..ad97d93 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -3035,6 +3035,7 @@  static struct snd_pci_quirk cxt5066_cfg_tbl[] = {
 	SND_PCI_QUIRK(0x17aa, 0x21c6, "Thinkpad Edge 13", CXT5066_ASUS),
  	SND_PCI_QUIRK(0x17aa, 0x215e, "Lenovo Thinkpad", CXT5066_THINKPAD),
 	SND_PCI_QUIRK(0x17aa, 0x21da, "Lenovo X220", CXT5066_THINKPAD),
+	SND_PCI_QUIRK(0x17aa, 0x21db, "Lenovo X220-tablet", CXT5066_THINKPAD),
 	SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo G560", CXT5066_ASUS),
 	SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo", CXT5066_IDEAPAD), /* Fallback for Lenovos without dock mic */
 	{}
-- 
1.7.4.1