aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastian Blank <waldi@debian.org>2006-04-29 19:10:24 +0000
committerBastian Blank <waldi@debian.org>2006-04-29 19:10:24 +0000
commit8911b8bcd26638138e5e3832a80feda9ad88c9e7 (patch)
tree2bba16331b5a1640351a65f6663f667215a1d1a2
parent2f48f1fd7e15da3f9c34afc97623788240f89761 (diff)
downloadkernel_replicant_linux-8911b8bcd26638138e5e3832a80feda9ad88c9e7.tar.gz
kernel_replicant_linux-8911b8bcd26638138e5e3832a80feda9ad88c9e7.tar.bz2
kernel_replicant_linux-8911b8bcd26638138e5e3832a80feda9ad88c9e7.zip
* debian/arch/s390/defines: Enable vserver subarch.
* debian/changelog: Update. svn path=/dists/sid/linux-2.6/; revision=6493
-rw-r--r--debian/arch/s390/defines2
-rw-r--r--debian/changelog5
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/arch/s390/defines b/debian/arch/s390/defines
index 7e082362503e..5806376bcdfb 100644
--- a/debian/arch/s390/defines
+++ b/debian/arch/s390/defines
@@ -2,6 +2,8 @@
flavours: s390 s390x
kernel-arch: s390
kernel-header-dirs: s390
+subarches:
+ vserver
[image]
desc: This kernel has support to IPL (boot) from a VM reader or DASD device.
diff --git a/debian/changelog b/debian/changelog
index b6d8b2a4eecd..3f285cdb6651 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,10 @@ linux-2.6 (2.6.16-11) UNRELEASED; urgency=low
* Update vserver patch to 2.0.2-rc18.
- Limit ccaps to root inside a guest
- * Conflict with known broken grub versions. (closes: #361308)
+ * Conflict with known broken grub versions. (closes: #361308)
+ * Enable s390 vserver image.
- -- Bastian Blank <waldi@debian.org> Fri, 28 Apr 2006 22:52:13 +0200
+ -- Bastian Blank <waldi@debian.org> Sat, 29 Apr 2006 21:09:37 +0200
linux-2.6 (2.6.16-10) unstable; urgency=low