Final fixups for 2.6.11.12 patches

diff --git a/queue/bttv-vc100.patch b/queue/bttv-vc100.patch
index dc8bfd247a9c284bcd3f6307851a163cc61195a4..df22e5397728e616d20f67cbd5f8c42ee6850582 100644 (file)
--- 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 <pete@phraxos.nildram.co.uk>
 From: Marin Glibic <zhilla@bigfoot.com>
 To: stable@kernel.org
 Cc: Greg KH <gregkh@suse.de>
 Subject: [PATCH] Fix for bttv driver (v0.9.15) for Leadtek WinFast VC100 XP capture cards
 
+From: Pete Jewell <pete@phraxos.nildram.co.uk>
 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 811e20e825036c10b9d3b8adfca7e6b68cfc5729..f454cd47759e6194b2c9a8afc5b1631b3a2abd82 100644 (file)
--- 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 <wli@holomorphy.com>
 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 a4135fe6aa69b2cdddbe5687f700f736ea9c8af1..11f7363d409c7bebf2bfd2e6464946f2476e3b21 100644 (file)
--- 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 <ak@suse.de>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
 ---
+
  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 <gregkh@suse.de>
                        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) {