diff --git a/debian/changelog b/debian/changelog index 29f80683e..7cf4e25a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,6 @@ -linux-2.6 (2.6.39~rc4-1~experimental.2) UNRELEASED; urgency=low +linux-2.6 (2.6.39~rc5-1~experimental.1) UNRELEASED; urgency=low + + * New upstream release candidate [ Ben Hutchings ] * [powerpc] kexec: Fix build failure on 32-bit SMP diff --git a/debian/patches/bugfix/all/kconfig-Avoid-buffer-underrun-in-choice-input.patch b/debian/patches/bugfix/all/kconfig-Avoid-buffer-underrun-in-choice-input.patch deleted file mode 100644 index ee611b1ab..000000000 --- a/debian/patches/bugfix/all/kconfig-Avoid-buffer-underrun-in-choice-input.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f924897c3f04927d0d28d71b11c4019c9dd7a9f2 Mon Sep 17 00:00:00 2001 -From: Ben Hutchings -Date: Sat, 19 Mar 2011 04:11:33 +0000 -Subject: [PATCH] kconfig: Avoid buffer underrun in choice input - -commit 40aee729b350672c2550640622416a855e27938f ('kconfig: fix default -value for choice input') fixed some cases where kconfig would select -the wrong option from a choice with a single valid option and thus -enter an infinite loop. - -However, this broke the test for user input of the form 'N?', because -when kconfig selects the single valid option the input is zero-length -and the test will read the byte before the input buffer. If this -happens to contain '?' (as it will in a mips build on Debian unstable -today) then kconfig again enters an infinite loop. - -Signed-off-by: Ben Hutchings -Cc: stable@kernel.org [2.6.17+] ---- - scripts/kconfig/conf.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c -index 659326c..006ad81 100644 ---- a/scripts/kconfig/conf.c -+++ b/scripts/kconfig/conf.c -@@ -332,7 +332,7 @@ static int conf_choice(struct menu *menu) - } - if (!child) - continue; -- if (line[strlen(line) - 1] == '?') { -+ if (line[0] && line[strlen(line) - 1] == '?') { - print_help(child); - continue; - } --- -1.7.4.1 - diff --git a/debian/patches/bugfix/s390/S390-pfault-fix-token-handling.patch b/debian/patches/bugfix/s390/S390-pfault-fix-token-handling.patch deleted file mode 100644 index 8fb868c39..000000000 --- a/debian/patches/bugfix/s390/S390-pfault-fix-token-handling.patch +++ /dev/null @@ -1,73 +0,0 @@ -From: Heiko Carstens -Subject: [S390] pfault: fix token handling -Date: Tue, 19 Apr 2011 08:34:01 +0200 - -f6649a7e "[S390] cleanup lowcore access from external interrupts" changed -handling of external interrupts. Instead of letting the external interrupt -handlers accessing the per cpu lowcore the entry code of the kernel reads -already all fields that are necessary and passes them to the handlers. -The pfault interrupt handler was incorrectly converted. It tries to -dereference a value which used to be a pointer to a lowcore field. After -the conversion however it is not anymore the pointer to the field but its -content. So instead of a dereference only a cast is needed to get the -task pointer that caused the pfault. - -Fixes a NULL pointer dereference and a subsequent kernel crash: - -Unable to handle kernel pointer dereference at virtual kernel address (null) -Oops: 0004 [#1] SMP -Modules linked in: nfsd exportfs nfs lockd fscache nfs_acl auth_rpcgss sunrpc - loop qeth_l3 qeth vmur ccwgroup ext3 jbd mbcache dm_mod - dasd_eckd_mod dasd_diag_mod dasd_mod -CPU: 0 Not tainted 2.6.38-2-s390x #1 -Process cron (pid: 1106, task: 000000001f962f78, ksp: 000000001fa0f9d0) -Krnl PSW : 0404200180000000 000000000002c03e (pfault_interrupt+0xa2/0x138) - R:0 T:1 IO:0 EX:0 Key:0 M:1 W:0 P:0 AS:0 CC:2 PM:0 EA:3 -Krnl GPRS: 0000000000000000 0000000000000001 0000000000000000 0000000000000001 - 000000001f962f78 0000000000518968 0000000090000002 000000001ff03280 - 0000000000000000 000000000064f000 000000001f962f78 0000000000002603 - 0000000006002603 0000000000000000 000000001ff7fe68 000000001ff7fe48 -Krnl Code: 000000000002c036: 5820d010 l %r2,16(%r13) - 000000000002c03a: 1832 lr %r3,%r2 - 000000000002c03c: 1a31 ar %r3,%r1 - >000000000002c03e: ba23d010 cs %r2,%r3,16(%r13) - 000000000002c042: a744fffc brc 4,2c03a - 000000000002c046: a7290002 lghi %r2,2 - 000000000002c04a: e320d0000024 stg %r2,0(%r13) - 000000000002c050: 07f0 bcr 15,%r0 -Call Trace: - ([<000000001f962f78>] 0x1f962f78) - [<000000000001acda>] do_extint+0xf6/0x138 - [<000000000039b6ca>] ext_no_vtime+0x30/0x34 - [<000000007d706e04>] 0x7d706e04 -Last Breaking-Event-Address: - [<0000000000000000>] 0x0 - -For stable maintainers: -the first kernel which contains this bug is 2.6.37. - -Reported-by: Stephen Powell -Cc: Jonathan Nieder -Cc: stable@kernel.org -Signed-off-by: Heiko Carstens ---- - - arch/s390/mm/fault.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c -index 9217e33..4cf85fe 100644 ---- a/arch/s390/mm/fault.c -+++ b/arch/s390/mm/fault.c -@@ -558,9 +558,9 @@ static void pfault_interrupt(unsigned int ext_int_code, - * Get the token (= address of the task structure of the affected task). - */ - #ifdef CONFIG_64BIT -- tsk = *(struct task_struct **) param64; -+ tsk = (struct task_struct *) param64; - #else -- tsk = *(struct task_struct **) param32; -+ tsk = (struct task_struct *) param32; - #endif - - if (subcode & 0x0080) { diff --git a/debian/patches/series/1~experimental.2 b/debian/patches/series/1~experimental.2 deleted file mode 100644 index 9fb661ced..000000000 --- a/debian/patches/series/1~experimental.2 +++ /dev/null @@ -1,3 +0,0 @@ -+ bugfix/all/drm-nouveau-Use-pci_dma_mapping_error.patch -+ bugfix/all/drm-radeon-Use-pci_dma_mapping_error.patch - diff --git a/debian/patches/series/base b/debian/patches/series/base index 99b5e7060..04de50c2c 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -42,6 +42,6 @@ + features/all/perf-Define-make-variables-ARCH-and-SRCARCH-consiste.patch + bugfix/arm/arm-Fix-.size-directive-for-xscale_dma_a0_map_area.patch + debian/sched-autogroup-disabled.patch -+ bugfix/all/kconfig-Avoid-buffer-underrun-in-choice-input.patch + bugfix/all/rt2800-disable-powersaving-as-default.patch -+ bugfix/s390/S390-pfault-fix-token-handling.patch ++ bugfix/all/drm-nouveau-Use-pci_dma_mapping_error.patch ++ bugfix/all/drm-radeon-Use-pci_dma_mapping_error.patch