From: Chris Wright Date: Sun, 12 Jun 2005 03:13:13 +0000 (-0700) Subject: Final fixups for 2.6.11.12 patches X-Git-Tag: v2.6.11.12~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=97489a9c54a27d3aa0651210b26669f155ad8618;p=thirdparty%2Fkernel%2Fstable-queue.git Final fixups for 2.6.11.12 patches --- diff --git a/queue/bttv-vc100.patch b/queue/bttv-vc100.patch index dc8bfd247a9..df22e539772 100644 --- a/queue/bttv-vc100.patch +++ b/queue/bttv-vc100.patch @@ -1,11 +1,11 @@ From stable-bounces@linux.kernel.org Wed Jun 1 12:54:20 2005 Date: Wed, 01 Jun 2005 21:16:04 +0200 -From: Pete Jewell From: Marin Glibic To: stable@kernel.org Cc: Greg KH Subject: [PATCH] Fix for bttv driver (v0.9.15) for Leadtek WinFast VC100 XP capture cards +From: Pete Jewell Cc: kraxel@bytesex.org This is a tiny patch that fixes bttv-cards.c so that Leadtek WinFast diff --git a/queue/fix-pte_unmap.patch b/queue/fix-pte_unmap.patch index 811e20e8250..f454cd47759 100644 --- a/queue/fix-pte_unmap.patch +++ b/queue/fix-pte_unmap.patch @@ -2,9 +2,7 @@ From stable-bounces@linux.kernel.org Thu May 26 22:52:42 2005 Date: Thu, 26 May 2005 22:43:11 -0700 From: William Lee Irwin III To: stable@kernel.org -Subject: try_to_unmap_cluster() passes out-of-bounds pte to pte_unmap() - -[PATCH] try_to_unmap_cluster() passes out-of-bounds pte to pte_unmap() +Subject: [PATCH] try_to_unmap_cluster() passes out-of-bounds pte to pte_unmap() try_to_unmap_cluster() does: for (pte = pte_offset_map(pmd, address); diff --git a/queue/x86_64-fix-ptrace-boundary-check.patch b/queue/x86_64-fix-ptrace-boundary-check.patch index a4135fe6aa6..11f7363d409 100644 --- a/queue/x86_64-fix-ptrace-boundary-check.patch +++ b/queue/x86_64-fix-ptrace-boundary-check.patch @@ -13,14 +13,16 @@ Found and fixed by John Blackwood Signed-off-by: Andi Kleen Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman - --- + arch/x86_64/kernel/ptrace.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---- linux-2.6.11.10.orig/arch/x86_64/kernel/ptrace.c 2005-05-16 10:50:31.000000000 -0700 -+++ linux-2.6.11.10/arch/x86_64/kernel/ptrace.c 2005-06-08 22:40:26.000000000 -0700 -@@ -247,7 +247,7 @@ +Index: release-2.6.11-test/arch/x86_64/kernel/ptrace.c +=================================================================== +--- release-2.6.11-test.orig/arch/x86_64/kernel/ptrace.c ++++ release-2.6.11-test/arch/x86_64/kernel/ptrace.c +@@ -252,7 +252,7 @@ asmlinkage long sys_ptrace(long request, break; switch (addr) { @@ -29,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman tmp = getreg(child, addr); break; case offsetof(struct user, u_debugreg[0]): -@@ -292,7 +292,7 @@ +@@ -297,7 +297,7 @@ asmlinkage long sys_ptrace(long request, break; switch (addr) {