linux-kernel - Re: [PATCH 01/14] MAINTAINERS: update drivers/platform/x86 information

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-id: <alpine.LFD.2.00.1003011320540.4281@localhost.localdomain>
Date:	Mon, 01 Mar 2010 13:23:25 -0500 (EST)
From:	Len Brown <lenb@...nel.org>
To:	Matthew Garrett <mjg59@...f.ucam.org>
Cc:	Corentin Chary <corentin.chary@...il.com>,
	torvalds@...ux-foundation.org, linux-kernel@...r.kernel.org,
	Anisse Astier <anisse@...ier.eu>,
	Carlos Corbacho <carlos@...angeworlds.co.uk>,
	Cezary Jackiewicz <cezary.jackiewicz@...il.com>,
	Daniel Oliveira Nascimento <don@...t.com.br>,
	Harald Welte <laforge@...monks.org>,
	Henrique de Moraes Holschuh <ibm-acpi@....eng.br>,
	Herton Ronaldo Krzesinski <herton@...driva.com.br>,
	Jonathan Woithe <jwoithe@...sics.adelaide.edu.au>,
	Karol Kozimor <sziwan@...rs.sourceforge.net>,
	Lennart Poettering <mzxreary@...inter.de>,
	Mattia Dongili <malattia@...ux.it>,
	Peter Feuerer <peter@...e.net>,
	Sujith Thomas <sujith.thomas@...el.com>,
	Thadeu Lima de Souza Cascardo <cascardo@...oscopio.com>
Subject: Re: [PATCH 01/14] MAINTAINERS: update drivers/platform/x86 information



thanks,
Len Brown, Intel Open Source Technology Center

On Mon, 1 Mar 2010, Matthew Garrett wrote:

> On Mon, Mar 01, 2010 at 12:59:03PM -0500, Len Brown wrote:
> 
> > Matthew,
> > Unless you object, I'll send Corentin's asus-laptop cleanup
> > upstream with my treek.
> 
> I've just pulled this in (along with a couple of other minor fixes) - 
> I'm just waiting to make sure I get the right set of Thinkpad fixes 
> before sending another pull request.

excellent.

please pick up this one too, and I'll delete my asus branch.

thanks,
-Len


>From 6204ff7f967d68b6c3b830b6df2cf2a3081b77a8 Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@...il.com>
Date: Tue, 2 Feb 2010 14:37:57 -0800
Subject: [PATCH] asus-acpi: remove duplicate comparison of asus_model strings
X-Patchwork-Hint: ignore

These tests already occur elsewhere

Signed-off-by: Roel Kluin <roel.kluin@...il.com>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
Acked-by: Corentin Chary <corentin.chary@...il.com>
Signed-off-by: Len Brown <len.brown@...el.com>
---
 drivers/platform/x86/asus_acpi.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c
index c1d2aee..1381430 100644
--- a/drivers/platform/x86/asus_acpi.c
+++ b/drivers/platform/x86/asus_acpi.c
@@ -1225,9 +1225,8 @@ static int asus_model_match(char *model)
 	else if (strncmp(model, "M2N", 3) == 0 ||
 		 strncmp(model, "M3N", 3) == 0 ||
 		 strncmp(model, "M5N", 3) == 0 ||
-		 strncmp(model, "M6N", 3) == 0 ||
 		 strncmp(model, "S1N", 3) == 0 ||
-		 strncmp(model, "S5N", 3) == 0 || strncmp(model, "W1N", 3) == 0)
+		 strncmp(model, "S5N", 3) == 0)
 		return xxN;
 	else if (strncmp(model, "M1", 2) == 0)
 		return M1A;
-- 
1.7.0.87.g0901d

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/