release 3.0-rc3

now all build fixes have materialised in linux-next.

svn path=/dists/trunk/linux-2.6/; revision=17702
This commit is contained in:
Maximilian Attems 2011-06-16 13:06:27 +00:00
parent e6e3e3cc26
commit 12d9a93b79
3 changed files with 35 additions and 2 deletions

5
debian/changelog vendored
View File

@ -1,4 +1,4 @@
linux-2.6 (3.0.0~rc3-1~experimental.1) UNRELEASED; urgency=low
linux-2.6 (3.0.0~rc3-1~experimental.1) experimental; urgency=low
* New upstream release candidate
@ -10,8 +10,9 @@ linux-2.6 (3.0.0~rc3-1~experimental.1) UNRELEASED; urgency=low
* Update configs.
* Topconfig enable BPF_JIT. (closes: #630553)
* Update debconf pt (Américo Monteiro) translations. (closes: #627631)
* Add kbuild fixes out of linux-next.
-- maximilian attems <maks@debian.org> Tue, 14 Jun 2011 23:02:35 +0200
-- maximilian attems <maks@debian.org> Thu, 16 Jun 2011 15:04:33 +0200
linux-2.6 (3.0.0~rc2-1~experimental.1) experimental; urgency=low

View File

@ -0,0 +1,31 @@
From 37aa9a2eb4d9b1a4aec1fd18bb2bb6bca029de27 Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@canonical.com>
Date: Wed, 15 Jun 2011 14:35:00 +0100
Subject: [PATCH] perf: clear out make flags when calling kernel make kernelver
When generating the perf version from the kernel version using 'make
kernelver' it is necessary to clear out any MAKEFLAGS otherwise they may
trigger additional output which pollute the contents.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
---
tools/perf/util/PERF-VERSION-GEN | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/perf/util/PERF-VERSION-GEN b/tools/perf/util/PERF-VERSION-GEN
index 9c5fb4d..ad73300 100755
--- a/tools/perf/util/PERF-VERSION-GEN
+++ b/tools/perf/util/PERF-VERSION-GEN
@@ -23,7 +23,7 @@ if test -d ../../.git -o -f ../../.git &&
then
VN=$(echo "$VN" | sed -e 's/-/./g');
else
- VN=$(make -sC ../.. kernelversion)
+ VN=$(MAKEFLAGS= make -sC ../.. kernelversion)
fi
VN=$(expr "$VN" : v*'\(.*\)')
--
1.7.2.5

View File

@ -47,3 +47,4 @@
+ bugfix/ia64/nouveau-ACPI-support-is-dependent-on-X86.patch
+ bugfix/x86/x86-idle-EXPORT_SYMBOL-default_idle-pm_idle-if-CONFI.patch
+ bugfix/all/Fix-build-for-patch-1-users.patch
+ bugfix/all/perf-clear-out-make-flags-when-calling-kernel-make-k.patch