[kernel] r18245 - in dists/trunk/linux-2.6: . debian debian/installer/powerpc/modules/powerpc debian/installer/powerpc/modules/powerpc-powerpc-miboot debian/installer/powerpc/modules/powerpc-powerpc64 debian/installer/s390x debian/installer/sparc64/modules/sparc64

[Ben Hutchings]

Author: benh
Date: Sat Nov 12 03:50:35 2011
New Revision: 18245

Log:
Merge changes from sid

Added:
   dists/trunk/linux-2.6/debian/installer/powerpc/modules/powerpc-powerpc-miboot/ide-core-modules
      - copied unchanged from r18244, dists/sid/linux-2.6/debian/installer/powerpc/modules/powerpc-powerpc-miboot/ide-core-modules
   dists/trunk/linux-2.6/debian/installer/powerpc/modules/powerpc-powerpc64/ide-core-modules
      - copied unchanged from r18244, dists/sid/linux-2.6/debian/installer/powerpc/modules/powerpc-powerpc64/ide-core-modules
   dists/trunk/linux-2.6/debian/installer/powerpc/modules/powerpc/ide-core-modules
      - copied unchanged from r18244, dists/sid/linux-2.6/debian/installer/powerpc/modules/powerpc/ide-core-modules
   dists/trunk/linux-2.6/debian/installer/s390x/
      - copied from r18244, dists/sid/linux-2.6/debian/installer/s390x/
Modified:
   dists/trunk/linux-2.6/   (props changed)
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/installer/powerpc/modules/powerpc/ata-modules
   dists/trunk/linux-2.6/debian/installer/powerpc/modules/powerpc/scsi-core-modules
   dists/trunk/linux-2.6/debian/installer/sparc64/modules/sparc64/nic-modules

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Fri Nov 11 02:33:02 2011	(r18244)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Nov 12 03:50:35 2011	(r18245)
@@ -1,6 +1,11 @@
 linux-2.6 (3.1.0-1~experimental.2) UNRELEASED; urgency=low
 
+  [ Aurelien Jarno ]
+  * [s390x] Add s390x udebs, based on linux-kernel-di-s390x-2.6.
+  * [sparc64] Sync udebs with sparc.
+
   [ Ben Hutchings ]
+  * Fix module selection for {ata,ide,scsi-core}-modules udebs on powerpc
   * [alpha] wire up accept4 syscall, thanks to Michael Cree
   * iwlagn: fix modinfo display for 135 ucode (Closes: #647958)
   * [powerpc] ptrace: Fix build with gcc 4.6

Copied: dists/trunk/linux-2.6/debian/installer/powerpc/modules/powerpc-powerpc-miboot/ide-core-modules (from r18244, dists/sid/linux-2.6/debian/installer/powerpc/modules/powerpc-powerpc-miboot/ide-core-modules)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/powerpc/modules/powerpc-powerpc-miboot/ide-core-modules	Sat Nov 12 03:50:35 2011	(r18245, copy of r18244, dists/sid/linux-2.6/debian/installer/powerpc/modules/powerpc-powerpc-miboot/ide-core-modules)
@@ -0,0 +1 @@
+#include "../powerpc/ide-core-modules"

Copied: dists/trunk/linux-2.6/debian/installer/powerpc/modules/powerpc-powerpc64/ide-core-modules (from r18244, dists/sid/linux-2.6/debian/installer/powerpc/modules/powerpc-powerpc64/ide-core-modules)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/powerpc/modules/powerpc-powerpc64/ide-core-modules	Sat Nov 12 03:50:35 2011	(r18245, copy of r18244, dists/sid/linux-2.6/debian/installer/powerpc/modules/powerpc-powerpc64/ide-core-modules)
@@ -0,0 +1 @@
+#include "../powerpc/ide-core-modules"

Modified: dists/trunk/linux-2.6/debian/installer/powerpc/modules/powerpc/ata-modules
==============================================================================
--- dists/trunk/linux-2.6/debian/installer/powerpc/modules/powerpc/ata-modules	Fri Nov 11 02:33:02 2011	(r18244)
+++ dists/trunk/linux-2.6/debian/installer/powerpc/modules/powerpc/ata-modules	Sat Nov 12 03:50:35 2011	(r18245)
@@ -1,2 +1,2 @@
 #include <ata-modules>
-
+libata -

Copied: dists/trunk/linux-2.6/debian/installer/powerpc/modules/powerpc/ide-core-modules (from r18244, dists/sid/linux-2.6/debian/installer/powerpc/modules/powerpc/ide-core-modules)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/installer/powerpc/modules/powerpc/ide-core-modules	Sat Nov 12 03:50:35 2011	(r18245, copy of r18244, dists/sid/linux-2.6/debian/installer/powerpc/modules/powerpc/ide-core-modules)
@@ -0,0 +1 @@
+#include <ide-core-modules>

Modified: dists/trunk/linux-2.6/debian/installer/powerpc/modules/powerpc/scsi-core-modules
==============================================================================
--- dists/trunk/linux-2.6/debian/installer/powerpc/modules/powerpc/scsi-core-modules	Fri Nov 11 02:33:02 2011	(r18244)
+++ dists/trunk/linux-2.6/debian/installer/powerpc/modules/powerpc/scsi-core-modules	Sat Nov 12 03:50:35 2011	(r18245)
@@ -1,2 +1,3 @@
 #include <scsi-core-modules>
+scsi_mod -
 scsi_transport_spi

Modified: dists/trunk/linux-2.6/debian/installer/sparc64/modules/sparc64/nic-modules
==============================================================================
--- dists/trunk/linux-2.6/debian/installer/sparc64/modules/sparc64/nic-modules	Fri Nov 11 02:33:02 2011	(r18244)
+++ dists/trunk/linux-2.6/debian/installer/sparc64/modules/sparc64/nic-modules	Sat Nov 12 03:50:35 2011	(r18245)
@@ -40,6 +40,8 @@
 qla3xxx
 atl1
 niu
+igb
+igbvf
 
 # Support for virtual network devices under Sun Logical Domains.
 sunvnet ?