[kernel] r18902 - in dists/sid/linux-2.6/debian/patches: bugfix/arm bugfix/ia64 bugfix/mips bugfix/powerpc features/arm

[Ben Hutchings]

Author: benh
Date: Tue Apr  3 05:06:42 2012
New Revision: 18902

Log:
Add missing header information for bugfix/feature patches

Modified:
   dists/sid/linux-2.6/debian/patches/bugfix/arm/disable-scsi_acard.patch
   dists/sid/linux-2.6/debian/patches/bugfix/arm/ixp4xx_iobe.patch
   dists/sid/linux-2.6/debian/patches/bugfix/ia64/hardcode-arch-script-output.patch
   dists/sid/linux-2.6/debian/patches/bugfix/mips/disable-advansys.patch
   dists/sid/linux-2.6/debian/patches/bugfix/powerpc/lpar-console.patch
   dists/sid/linux-2.6/debian/patches/features/arm/ARM-kirkwood-6282A1.patch

Modified: dists/sid/linux-2.6/debian/patches/bugfix/arm/disable-scsi_acard.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/arm/disable-scsi_acard.patch	Tue Apr  3 04:34:17 2012	(r18901)
+++ dists/sid/linux-2.6/debian/patches/bugfix/arm/disable-scsi_acard.patch	Tue Apr  3 05:06:42 2012	(r18902)
@@ -1,3 +1,7 @@
+From: Gordon Farquharson <gordonfarquharson at gmail.com>
+Subject: [arm] Disable SCSI_ACARD
+Date: Mon, 12 Nov 2007 04:08:38 +0000
+
 ERROR: "__bad_udelay" [drivers/scsi/atp870u.ko] undefined!
 make[1]: *** [__modpost] Error 1
 

Modified: dists/sid/linux-2.6/debian/patches/bugfix/arm/ixp4xx_iobe.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/arm/ixp4xx_iobe.patch	Tue Apr  3 04:34:17 2012	(r18901)
+++ dists/sid/linux-2.6/debian/patches/bugfix/arm/ixp4xx_iobe.patch	Tue Apr  3 05:06:42 2012	(r18902)
@@ -1,4 +1,6 @@
-ixp4xx: add io{read,write}{16,32}be functions
+From: Arnaud Patard <arnaud.patard at rtp-net.org>
+Subject: ixp4xx: add io{read,write}{16,32}be functions
+Date: 2011-11-13 19:27:56 +0000
 
 Some driver are now requiring some be io functions, add noted in
 commit (06901bd83412db5a31de7526e637101ed0c2c472). Otherwise, it may lead

Modified: dists/sid/linux-2.6/debian/patches/bugfix/ia64/hardcode-arch-script-output.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/ia64/hardcode-arch-script-output.patch	Tue Apr  3 04:34:17 2012	(r18901)
+++ dists/sid/linux-2.6/debian/patches/bugfix/ia64/hardcode-arch-script-output.patch	Tue Apr  3 05:06:42 2012	(r18902)
@@ -1,3 +1,25 @@
+From: dann frazier <dannf at debian.org>
+Subject: Hardcode arch script output
+Date: Mon, 26 Mar 2007 16:30:51 -0600
+Bug-Debian: http://bugs.debian.org/392592
+
+Here's a patch that simply uses hardcoded definitions instead of
+doing the dynamic tests that require architecture-specific scripts.
+
+I don't particularly like this approach because it restricts
+portability and diverts from upstream. But, it is simpler, and this
+really needs to be fixed somehow before etch (along with a rebuild of
+linux-modules-extra-2.6), so I'm willing to live with it if my other
+patch is deemed unacceptable.
+
+My primary concern is that, in the future, the output of these scripts
+will change and we (or our successors) will either not notice or
+forget to update the hardcoded values.
+
+Including the scripts in linux-kbuild will avoid this manual step
+altogether, and allow for the possibility of other archs to provide
+their own scripts in the future.
+
 diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
 index e7cbaa0..c8af869 100644
 --- a/arch/ia64/Makefile

Modified: dists/sid/linux-2.6/debian/patches/bugfix/mips/disable-advansys.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/mips/disable-advansys.patch	Tue Apr  3 04:34:17 2012	(r18901)
+++ dists/sid/linux-2.6/debian/patches/bugfix/mips/disable-advansys.patch	Tue Apr  3 05:06:42 2012	(r18902)
@@ -1,3 +1,7 @@
+From: Martin Michlmayr <tbm at cyrius.com>
+Date: Sat, 19 Jan 2008 18:25:02 +0000
+Subject: [arm, mips] Disable Advansys
+
 Florian Lohoff <flo at rfc822.org> reports the following build failure on IP32:
 
   MODPOST 552 modules

Modified: dists/sid/linux-2.6/debian/patches/bugfix/powerpc/lpar-console.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/powerpc/lpar-console.patch	Tue Apr  3 04:34:17 2012	(r18901)
+++ dists/sid/linux-2.6/debian/patches/bugfix/powerpc/lpar-console.patch	Tue Apr  3 05:06:42 2012	(r18902)
@@ -1,3 +1,11 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: Fix console selection in PowerPC LPAR environment
+Date: Tue, 27 Sep 2011 06:04:39 +0100
+
+Do not override the preferred console set through the kernel parameter.
+
+Original version by Bastian Blank <waldi at debian.org>.
+
 --- a/drivers/tty/hvc/hvc_vio.c
 +++ b/drivers/tty/hvc/hvc_vio.c
 @@ -48,6 +48,7 @@

Modified: dists/sid/linux-2.6/debian/patches/features/arm/ARM-kirkwood-6282A1.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/ARM-kirkwood-6282A1.patch	Tue Apr  3 04:34:17 2012	(r18901)
+++ dists/sid/linux-2.6/debian/patches/features/arm/ARM-kirkwood-6282A1.patch	Tue Apr  3 05:06:42 2012	(r18902)
@@ -1,15 +1,15 @@
-commit a87d89e74f0a4b56eaee8c3ef74bce69277b780f
-Author: Martin Michlmayr <tbm at cyrius.com>
-Date:   Thu Nov 3 12:57:43 2011 +0000
+From: Martin Michlmayr <tbm at cyrius.com>
+Date: Thu Nov 3 12:57:43 2011 +0000
+Subject: ARM: Kirkwood: Recognize A1 revision of 6282 chip
 
-    ARM: Kirkwood: Recognize A1 revision of 6282 chip
-    
-    Recognize the Kirkwood 6282 revision A1 chip since products using
-    this chip are shipping now, such as the QNAP TS-x19P II devices.
-    
-    Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
-    Acked-by: Lennert Buytenhek <buytenh at wantstofly.org>
-    Signed-off-by: Nicolas Pitre <nico at fluxnic.net>
+commit a87d89e74f0a4b56eaee8c3ef74bce69277b780f upstream.
+
+Recognize the Kirkwood 6282 revision A1 chip since products using
+this chip are shipping now, such as the QNAP TS-x19P II devices.
+
+Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
+Acked-by: Lennert Buytenhek <buytenh at wantstofly.org>
+Signed-off-by: Nicolas Pitre <nico at fluxnic.net>
 
 diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
 index f3248cf..b9632ee 100644