[kernel] r17602 - in dists/trunk/linux-2.6/debian: . patches/series

[Ben Hutchings]

Author: benh
Date: Sun Jun  5 23:27:38 2011
New Revision: 17602

Log:
qla4xxx: Remove our fix for #598503

It has now been fixed upstream in a different way and the two changes
resulted in FTBFS.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.2
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Jun  5 22:34:36 2011	(r17601)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Jun  5 23:27:38 2011	(r17602)
@@ -11,6 +11,8 @@
 
   [ Ben Hutchings ]
   * perf: Cancel -Werror compiler option; fixes FTBFS with perl 5.14
+  * qla4xxx: Remove our fix for #598503; it has now been fixed upstream
+    in a different way and the two changes resulted in FTBFS
 
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 01 Jun 2011 06:41:14 +0100
 

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.2
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.2	Sun Jun  5 22:34:36 2011	(r17601)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.2	Sun Jun  5 23:27:38 2011	(r17602)
@@ -1,2 +1,3 @@
 + bugfix/arm/plat-iop-fixes-fail-to-build-from-source.patch
 + bugfix/mips/mips-i8259-use-struct-syscore_ops-instead-of-sysdevs.patch
+- bugfix/all/qla4xxx-Fix-build-on-some-architectures-lacking-64-bit-I-O.patch

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Sun Jun  5 22:34:36 2011	(r17601)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Sun Jun  5 23:27:38 2011	(r17602)
@@ -34,6 +34,7 @@
 + debian/decnet-Disable-auto-loading-as-mitigation-against-lo.patch
 
 + bugfix/mips/mips-ide-flush-dcache.patch
+# Remove this in next upstream version
 + bugfix/all/qla4xxx-Fix-build-on-some-architectures-lacking-64-bit-I-O.patch
 + bugfix/x86/Skip-looking-for-ioapic-overrides-when-ioapics-are-not-present.patch
 + bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch