Update to 3.1-rc7
svn path=/dists/trunk/linux-2.6/; revision=18111
This commit is contained in:
parent
6fb528de1a
commit
555d263559
|
@ -1,3 +1,9 @@
|
|||
linux-2.6 (3.1.0~rc7-1~experimental.1) UNRELEASED; urgency=low
|
||||
|
||||
* New upstream release candidate
|
||||
|
||||
-- Ben Hutchings <ben@decadent.org.uk> Thu, 22 Sep 2011 04:22:13 +0100
|
||||
|
||||
linux-2.6 (3.1.0~rc6-1~experimental.1) experimental; urgency=low
|
||||
|
||||
* New upstream release candidate
|
||||
|
|
|
@ -1,29 +0,0 @@
|
|||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Sun, 28 Aug 2011 21:45:13 +0100
|
||||
Subject: [PATCH] alpha, gpio: GENERIC_GPIO default must be n
|
||||
|
||||
Since GPIOLIB is optional on alpha, GENERIC_GPIO must not be
|
||||
selected by default. If GPIOLIB is enabled, it will select
|
||||
GENERIC_GPIO.
|
||||
|
||||
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
---
|
||||
arch/alpha/Kconfig | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
|
||||
index 60cde53..8bb9362 100644
|
||||
--- a/arch/alpha/Kconfig
|
||||
+++ b/arch/alpha/Kconfig
|
||||
@@ -51,7 +51,7 @@ config GENERIC_CMOS_UPDATE
|
||||
def_bool y
|
||||
|
||||
config GENERIC_GPIO
|
||||
- def_bool y
|
||||
+ bool
|
||||
|
||||
config ZONE_DMA
|
||||
bool
|
||||
--
|
||||
1.7.5.4
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Wed, 21 Sep 2011 04:55:14 +0100
|
||||
Subject: [PATCH] x86-32: Fix alignment of alternative instruction entries
|
||||
|
||||
The altinstruction_entry macro was originally used only on x86-64,
|
||||
and assumed 64-bit pointers and alignment.
|
||||
|
||||
Commit b4ca46e4e82a0a5976fe5eab85be585d75f8202f ("x86-32: Fix boot
|
||||
with CONFIG_X86_INVD_BUG") introduced a use of the macro on x86-32.
|
||||
Before this, the 64-bit pointers had been replaced by 32-bit offsets,
|
||||
so it worked - in at least one case. However, the alignment is still
|
||||
wrong for x86-32, which can result in zero-padding between entries and
|
||||
a BUG in apply_alternatives.
|
||||
|
||||
Reported-by: Andres Salomon <dilinger@queued.net>
|
||||
References: http://bugs.debian.org/640964
|
||||
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
---
|
||||
arch/x86/include/asm/alternative-asm.h | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
|
||||
index 4554cc6..d00dc2a 100644
|
||||
--- a/arch/x86/include/asm/alternative-asm.h
|
||||
+++ b/arch/x86/include/asm/alternative-asm.h
|
||||
@@ -16,7 +16,7 @@
|
||||
#endif
|
||||
|
||||
.macro altinstruction_entry orig alt feature orig_len alt_len
|
||||
- .align 8
|
||||
+ _ASM_ALIGN
|
||||
.long \orig - .
|
||||
.long \alt - .
|
||||
.word \feature
|
||||
--
|
||||
1.7.5.4
|
||||
|
|
@ -40,8 +40,6 @@
|
|||
+ 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/alpha/alpha-gpio-GENERIC_GPIO-default-must-be-n.patch
|
||||
+ bugfix/ia64/ia64-gpio-GENERIC_GPIO-default-must-be-n.patch
|
||||
+ features/x86/libertas-prioritize-usb8388_olpc.bin-firmware-on-OLPC-machines.patch
|
||||
+ bugfix/arm/ARM-ixp4xx-gpiolib-support.patch
|
||||
+ bugfix/x86/x86-32-Fix-alignment-of-alternative-instruction-entr.patch
|
||||
|
|
Loading…
Reference in New Issue