From patchwork Fri Sep 10 20:23:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 64455 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id D1A8EB6F0E for ; Sat, 11 Sep 2010 06:23:48 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OuA8I-0000EL-Ot; Fri, 10 Sep 2010 21:23:38 +0100 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OuA8G-0000EC-17 for kernel-team@lists.ubuntu.com; Fri, 10 Sep 2010 21:23:36 +0100 Received: from sepang.rtg.net (unknown [10.0.2.5]) by mail.tpi.com (Postfix) with ESMTP id BA61921AD0A; Fri, 10 Sep 2010 13:23:16 -0700 (PDT) Received: by sepang.rtg.net (Postfix, from userid 1000) id 5F9CBF8BBB; Fri, 10 Sep 2010 14:23:42 -0600 (MDT) To: leann@canonical.com Subject: Maverick request pull, CONFIG_NL80211_TESTMODE=n Message-Id: <20100910202342.5F9CBF8BBB@sepang.rtg.net> Date: Fri, 10 Sep 2010 14:23:42 -0600 (MDT) From: timg@tpi.com (Tim Gardner) Cc: kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com The following changes since commit af791e9e08878bd7ed34a9452f8cdb40d28bbd1c: Andy Whitcroft (1): UBUNTU: SAUCE: fbcon -- fix OOPs triggered by race prevention fixes are available in the git repository at: git://kernel.ubuntu.com/rtg/ubuntu-maverick.git NL80211_TESTMODE Tim Gardner (1): UBUNTU: [Config] CONFIG_NL80211_TESTMODE=n debian.master/config/config.common.ports | 2 +- debian.master/config/config.common.ubuntu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) From 21083f6b4244725ff35877d4c93e83aec4b0f3f1 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Fri, 10 Sep 2010 14:18:53 -0600 Subject: [PATCH] UBUNTU: [Config] CONFIG_NL80211_TESTMODE=n We really shouldn't have this enabled. Its a debug only feature. Signed-off-by: Tim Gardner --- debian.master/config/config.common.ports | 2 +- debian.master/config/config.common.ubuntu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports index af11353..e99532b 100644 --- a/debian.master/config/config.common.ports +++ b/debian.master/config/config.common.ports @@ -2340,7 +2340,7 @@ CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NF_NAT_TFTP=m CONFIG_NILFS2_FS=m # CONFIG_NIU is not set -CONFIG_NL80211_TESTMODE=y +# CONFIG_NL80211_TESTMODE is not set CONFIG_NLATTR=y CONFIG_NLS=y CONFIG_NLS_ASCII=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index efa786f..b5a4405 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2972,7 +2972,7 @@ CONFIG_NI52=m CONFIG_NI65=m CONFIG_NILFS2_FS=m CONFIG_NIU=m -CONFIG_NL80211_TESTMODE=y +# CONFIG_NL80211_TESTMODE is not set CONFIG_NLATTR=y CONFIG_NLS=y CONFIG_NLS_ASCII=m