[kernel] r15835 - in dists/sid/linux-2.6/debian/patches/bugfix: all parisc sh4

[Ben Hutchings]

Author: benh
Date: Sun Jun  6 17:52:24 2010
New Revision: 15835

Log:
Fix patch format and upstream references

Modified:
   dists/sid/linux-2.6/debian/patches/bugfix/all/ext4-Conditionally-define-compat-ioctl-numbers.patch
   dists/sid/linux-2.6/debian/patches/bugfix/parisc/clear-fp-exception-flag-on-SIGFPE.patch
   dists/sid/linux-2.6/debian/patches/bugfix/sh4/fix-sh_tmu.patch

Modified: dists/sid/linux-2.6/debian/patches/bugfix/all/ext4-Conditionally-define-compat-ioctl-numbers.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/ext4-Conditionally-define-compat-ioctl-numbers.patch	Sun Jun  6 17:51:44 2010	(r15834)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/ext4-Conditionally-define-compat-ioctl-numbers.patch	Sun Jun  6 17:52:24 2010	(r15835)
@@ -2,7 +2,7 @@
 Date: Mon, 17 May 2010 09:00:00 -0400
 Subject: [PATCH 1/2] ext4: Conditionally define compat ioctl numbers
 
-commit 3ad0fa9c3af24b787158aa7d1bca18e401082e33 upstream.
+commit 899ad0cea6ad7ff4ba24b16318edbc3cbbe03fad upstream.
 
 It is unnecessary, and in general impossible, to define the compat
 ioctl numbers except when building the filesystem with CONFIG_COMPAT

Modified: dists/sid/linux-2.6/debian/patches/bugfix/parisc/clear-fp-exception-flag-on-SIGFPE.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/parisc/clear-fp-exception-flag-on-SIGFPE.patch	Sun Jun  6 17:51:44 2010	(r15834)
+++ dists/sid/linux-2.6/debian/patches/bugfix/parisc/clear-fp-exception-flag-on-SIGFPE.patch	Sun Jun  6 17:52:24 2010	(r15835)
@@ -1,18 +1,21 @@
-commit 550f0d922286556c7ea43974bb7921effb5a5278
-Author: Helge Deller <deller at gmx.de>
-Date:   Mon May 3 20:44:21 2010 +0000
-
-    parisc: clear floating point exception flag on SIGFPE signal
-    
-    Clear the floating point exception flag before returning to
-    user space. This is needed, else the libc trampoline handler
-    may hit the same SIGFPE again while building up a trampoline
-    to a signal handler.
-    
-    Fixes debian bug #559406.
-    
-    Signed-off-by: Helge Deller <deller at gmx.de>
-    Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>
+From: Helge Deller <deller at gmx.de>
+Date: Mon, 3 May 2010 20:44:21 +0000
+Subject: [PATCH] parisc: clear floating point exception flag on SIGFPE signal
+
+commit 550f0d922286556c7ea43974bb7921effb5a5278 upstream.
+
+Clear the floating point exception flag before returning to
+user space. This is needed, else the libc trampoline handler
+may hit the same SIGFPE again while building up a trampoline
+to a signal handler.
+
+Fixes debian bug #559406.
+
+Signed-off-by: Helge Deller <deller at gmx.de>
+Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>
+---
+ arch/parisc/math-emu/decode_exc.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
 
 diff --git a/arch/parisc/math-emu/decode_exc.c b/arch/parisc/math-emu/decode_exc.c
 index 3ca1c61..27a7492 100644
@@ -26,3 +29,6 @@
  	  	return SIGNALCODE(SIGFPE, FPE_FLTDIV);
  	  case INEXACTEXCEPTION:
  		update_trap_counts(Fpu_register, aflags, bflags, trap_counts);
+-- 
+1.7.1
+

Modified: dists/sid/linux-2.6/debian/patches/bugfix/sh4/fix-sh_tmu.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/sh4/fix-sh_tmu.patch	Sun Jun  6 17:51:44 2010	(r15834)
+++ dists/sid/linux-2.6/debian/patches/bugfix/sh4/fix-sh_tmu.patch	Sun Jun  6 17:52:24 2010	(r15835)
@@ -2,6 +2,8 @@
 Date: Mon, 31 May 2010 21:45:48 +0000 (+0000)
 Subject: clocksource: sh_tmu: compute mult and shift before registration
 
+commit 66f49121ffa41a19c59965b31b046d8368fec3c7 upstream.
+
 clocksource: sh_tmu: compute mult and shift before registration
 
 Since commit 98962465ed9e6ea99c38e0af63fe1dcb5a79dc25 ("nohz: Prevent