[kernel] r17933 - in dists/trunk/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Mon Aug 15 14:28:10 2011
New Revision: 17933

Log:
Update to 3.1-rc2

Deleted:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/perf-do-not-look-at-.-config-for-configuration.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon Aug 15 14:15:59 2011	(r17932)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Aug 15 14:28:10 2011	(r17933)
@@ -1,6 +1,8 @@
-linux-2.6 (3.1.0~rc1-1~experimental.1) UNRELEASED; urgency=low
+linux-2.6 (3.1.0~rc2-1~experimental.1) UNRELEASED; urgency=low
 
   * New upstream release candidate
+    - perf: do not look at ./config for configuration (Closes: #632923)
+      (CVE-2011-2905)
 
   [ Aurelien Jarno ]
   * Add configuration files for s390x architecture.
@@ -15,9 +17,6 @@
   * aufs: Disable until it is updated for Linux 3.1
   * rt: Disable until it is updated for Linux 3.1
 
-  [ Jonathan Nieder ]
-  * perf: do not look at ./config for configuration (Closes: #632923)
-
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 27 Jul 2011 23:58:10 +0200
 
 linux-2.6 (3.0.0-1) unstable; urgency=low

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Mon Aug 15 14:15:59 2011	(r17932)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Mon Aug 15 14:28:10 2011	(r17933)
@@ -40,4 +40,3 @@
 + features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
 + debian/cgroups-Document-the-Debian-memory-resource-controll.patch
 + bugfix/ia64/nouveau-ACPI-support-is-dependent-on-X86.patch
-+ bugfix/all/perf-do-not-look-at-.-config-for-configuration.patch