Patchwork Maverick Beta Approaching

login
register
mail settings
Submitter David Henningsson
Date Aug. 24, 2010, 9:25 a.m.
Message ID <4C73900B.9040006@canonical.com>
Download mbox | patch
Permalink /patch/62560/
State Accepted
Delegated to: Leann Ogasawara
Headers show

Comments

David Henningsson - Aug. 24, 2010, 9:25 a.m.
2010-08-24 03:35, Leann Ogasawara skrev:
> On Mon, 2010-08-23 at 17:21 -0700, Leann Ogasawara wrote:
>> Any
>> kernel patches which you want to see included in the Maverick Beta
>> kernel need to be submitted to this mailing list and obtain the
>> necessary Ack's *before* this Fri Aug 27.

I'm still new, and still looking for a checklist of what/how to do with
my patches, what to put here and there to satisfy both upstream and
Ubuntu. So far I've been sending them upstream only.

Mind adding the attached ones for Maverick Beta? Some of them might
already be there. Or do you prefer git SHA's?
Tim Gardner - Aug. 24, 2010, 12:52 p.m.
On 08/24/2010 03:25 AM, David Henningsson wrote:
> 2010-08-24 03:35, Leann Ogasawara skrev:
>> On Mon, 2010-08-23 at 17:21 -0700, Leann Ogasawara wrote:
>>> Any
>>> kernel patches which you want to see included in the Maverick Beta
>>> kernel need to be submitted to this mailing list and obtain the
>>> necessary Ack's *before* this Fri Aug 27.
>
> I'm still new, and still looking for a checklist of what/how to do with
> my patches, what to put here and there to satisfy both upstream and
> Ubuntu. So far I've been sending them upstream only.
>
> Mind adding the attached ones for Maverick Beta? Some of them might
> already be there. Or do you prefer git SHA's?
>
>

David - all of these patches look appropriate for stable updates. If you add

Cc: stable@kernel.org

immediately after your Signed-off-by: in the upstream submission, then 
they'll automatically propagate to the various stable updates once they 
are accepted into Linus' tree. Otherwise you'll have to send an email to 
stable@kernel.org with the SHA1 from Linus' tree requesting them for 
inclusion in the next stable update.

rtg
David Henningsson - Aug. 24, 2010, 1:28 p.m.
2010-08-24 14:52, Tim Gardner skrev:
> On 08/24/2010 03:25 AM, David Henningsson wrote:
>> 2010-08-24 03:35, Leann Ogasawara skrev:
>>> On Mon, 2010-08-23 at 17:21 -0700, Leann Ogasawara wrote:
>>>> Any
>>>> kernel patches which you want to see included in the Maverick Beta
>>>> kernel need to be submitted to this mailing list and obtain the
>>>> necessary Ack's *before* this Fri Aug 27.
>>
>> I'm still new, and still looking for a checklist of what/how to do with
>> my patches, what to put here and there to satisfy both upstream and
>> Ubuntu. So far I've been sending them upstream only.
>>
>> Mind adding the attached ones for Maverick Beta? Some of them might
>> already be there. Or do you prefer git SHA's?
>>
>>
> 
> David - all of these patches look appropriate for stable updates. If you
> add
> 
> Cc: stable@kernel.org
> 
> immediately after your Signed-off-by: in the upstream submission, then
> they'll automatically propagate to the various stable updates once they
> are accepted into Linus' tree. Otherwise you'll have to send an email to
> stable@kernel.org with the SHA1 from Linus' tree requesting them for
> inclusion in the next stable update.

Thanks for the tip, I hope I'll remember it for next time. However,
IIRC, this can take several weeks, right? What if I want them to reach
Ubuntu before that, due to e g various Ubuntu Archive freezes?
Tim Gardner - Aug. 24, 2010, 1:36 p.m.
On 08/24/2010 07:28 AM, David Henningsson wrote:
> 2010-08-24 14:52, Tim Gardner skrev:
>> On 08/24/2010 03:25 AM, David Henningsson wrote:
>>> 2010-08-24 03:35, Leann Ogasawara skrev:
>>>> On Mon, 2010-08-23 at 17:21 -0700, Leann Ogasawara wrote:
>>>>> Any
>>>>> kernel patches which you want to see included in the Maverick Beta
>>>>> kernel need to be submitted to this mailing list and obtain the
>>>>> necessary Ack's *before* this Fri Aug 27.
>>>
>>> I'm still new, and still looking for a checklist of what/how to do with
>>> my patches, what to put here and there to satisfy both upstream and
>>> Ubuntu. So far I've been sending them upstream only.
>>>
>>> Mind adding the attached ones for Maverick Beta? Some of them might
>>> already be there. Or do you prefer git SHA's?
>>>
>>>
>>
>> David - all of these patches look appropriate for stable updates. If you
>> add
>>
>> Cc: stable@kernel.org
>>
>> immediately after your Signed-off-by: in the upstream submission, then
>> they'll automatically propagate to the various stable updates once they
>> are accepted into Linus' tree. Otherwise you'll have to send an email to
>> stable@kernel.org with the SHA1 from Linus' tree requesting them for
>> inclusion in the next stable update.
>
> Thanks for the tip, I hope I'll remember it for next time. However,
> IIRC, this can take several weeks, right? What if I want them to reach
> Ubuntu before that, due to e g various Ubuntu Archive freezes?
>

If you can show that these patches are in a maintainer's tree (like 
Takashi's ALSA tree) and destined for mainline inclusion, then Leann 
might consider taking them as pre-stable patches. These particular 
patches are pretty minor, but a more complex patch would require a bit 
more consideration because even if we take it now, the patch that lands 
upstream could be quite different thus increasing our maintenance burden.

rtg
Leann Ogasawara - Aug. 24, 2010, 5:29 p.m.
On Tue, 2010-08-24 at 11:25 +0200, David Henningsson wrote:
> 2010-08-24 03:35, Leann Ogasawara skrev:
> > On Mon, 2010-08-23 at 17:21 -0700, Leann Ogasawara wrote:
> >> Any
> >> kernel patches which you want to see included in the Maverick Beta
> >> kernel need to be submitted to this mailing list and obtain the
> >> necessary Ack's *before* this Fri Aug 27.
> 
> I'm still new, and still looking for a checklist of what/how to do with
> my patches, what to put here and there to satisfy both upstream and
> Ubuntu. So far I've been sending them upstream only.
> 
> Mind adding the attached ones for Maverick Beta? Some of them might
> already be there. Or do you prefer git SHA's?

Hi David,

Thanks for the patches.  Per our IRC chat earlier on #ubuntu-kernel, it
appears the following two patches just recently went upstream:

ALSA: HDA: Fix front mic on Dell Precision M6500
http://mailman.alsa-project.org/pipermail/alsa-devel/2010-August/030940.html

ALSA: HDA: Add Sony VAIO quirk for ALC269
http://mailman.alsa-project.org/pipermail/alsa-devel/2010-August/030952.html

The remaining three are already upstream so I just did a straight
cherry-pick of those:

commit 81cd3fca642cecb40a1ccef099799dcb5730734b
Author: David Henningsson <david.henningsson@canonical.com>
Date:   Tue Aug 10 09:18:00 2010 +0200

    ALSA: HDA: Use model=auto for LG R510

commit 150b432f448281d5518f5229d240923f9a9c5459
Author: David Henningsson <david.henningsson@canonical.com>
Date:   Thu Jul 29 14:46:42 2010 +0200

    ALSA: hda - Rename iMic to Int Mic on Lenovo NB0763

commit 2385b789f1525542396d8f6b0cc37c1eb2493b4c
Author: David Henningsson <diwic@ubuntu.com>
Date:   Wed Jun 2 16:56:41 2010 +0200

    ALSA: hda - Ensure codec patch files are checked for the correct codec ID

So, I've applied all 5 patches to Maverick.  Just be sure to send these
patches to upstream stable as well.

Thanks,
Leann

Patch

From ae4e9f41cf404d879b14be56591c4d5c6b403b71 Mon Sep 17 00:00:00 2001
From: David Henningsson <diwic@ubuntu.com>
Date: Wed, 2 Jun 2010 16:56:41 +0200
Subject: [PATCH] Ensure codec patch files are checked for the correct codec ID
 Signed-off-by: David Henningsson <diwic@ubuntu.com>

---
 sound/pci/hda/hda_hwdep.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c
index a1fc837..0e2cb27 100644
--- a/sound/pci/hda/hda_hwdep.c
+++ b/sound/pci/hda/hda_hwdep.c
@@ -649,7 +649,9 @@  static void parse_codec_mode(char *buf, struct hda_bus *bus,
 	*codecp = NULL;
 	if (sscanf(buf, "%i %i %i", &vendorid, &subid, &caddr) == 3) {
 		list_for_each_entry(codec, &bus->codec_list, list) {
-			if (codec->addr == caddr) {
+			if (codec->vendor_id == vendorid && 
+					codec->subsystem_id == subid && 
+					codec->addr == caddr) {
 				*codecp = codec;
 				break;
 			}
-- 
1.7.0.4