Merge changes from sid
svn path=/dists/trunk/linux-2.6/; revision=18245
This commit is contained in:
Ben Hutchings
commit
9267200ee0
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
#include "../powerpc/ide-core-modules"
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include "../powerpc/ide-core-modules"
|
||||
|
|
@ -1,2 +1,2 @@
|
|||
#include <ata-modules>
|
||||
|
||||
libata -
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
#include <ide-core-modules>
|
||||
|
|
@ -1,2 +1,3 @@
|
|||
#include <scsi-core-modules>
|
||||
scsi_mod -
|
||||
scsi_transport_spi
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
# arch version flavour installedname suffix build-depends
|
||||
s390x - s390x - - -
|
||||
s390x - s390x-tape - -tape -
|
||||
|
|
@ -0,0 +1 @@
|
|||
# empty
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
vmcp ?
|
||||
mbcache
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <crypto-dm-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <crypto-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
dasd_diag_mod
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
dasd_eckd_mod
|
||||
dasd_fba_mod
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <ext2-modules>
|
||||
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <ext3-modules>
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <ext4-modules>
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <fat-modules>
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
# empty
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <md-modules>
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <multipath-modules>
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <nbd-modules>
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
netiucv
|
||||
ctcm
|
||||
lcs
|
||||
qeth
|
||||
qeth_l2
|
||||
qeth_l3
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <scsi-core-modules>
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
zfcp
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <virtio-modules>
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#include <xfs-modules>
|
||||
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
# This file is used to build up the control file. The kernel version and
|
||||
# "-di" are appended to the package names. Section can be left out. So can
|
||||
# architecture, which is derived from the files in the modules directory.
|
||||
# It overwrites specifications from /usr/share/kernel-wedge/package-list.
|
||||
#
|
||||
Package: kernel-image
|
||||
|
||||
Package: dasd-modules
|
||||
Depends: kernel-image
|
||||
Priority: standard
|
||||
Description: dasd modules
|
||||
This package contains dasd modules.
|
||||
|
||||
Package: dasd-extra-modules
|
||||
Depends: kernel-image, dasd-modules
|
||||
Priority: extra
|
||||
Description: optional dasd DIAG support
|
||||
This package contains the module for dasd DIAG support. The udeb is
|
||||
not loaded by default as the installer does not actually support this.
|
||||
It can however be useful to have available in rescue situations.
|
||||
|
||||
Package: ext2-modules
|
||||
Depends: kernel-image, core-modules
|
||||
|
||||
Package: ext3-modules
|
||||
Depends: kernel-image, core-modules
|
||||
|
||||
Package: nbd-modules
|
||||
Depends: kernel-image
|
||||
|
|
@ -40,6 +40,8 @@ uli526x
|
|||
qla3xxx
|
||||
atl1
|
||||
niu
|
||||
igb
|
||||
igbvf
|
||||
|
||||
# Support for virtual network devices under Sun Logical Domains.
|
||||
sunvnet ?
|
||||
|
|
|
|||
Loading…
Reference in New Issue