From b3604e9de8db09b6da7b730f098325cddbd8c55d Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Mon, 13 Mar 2006 12:59:02 +0000 Subject: [PATCH] Switch to 2.6.16-rc6. * debian/arch/amd64/defines, debian/arch/i386/defines, debian/arch/powerpc/defines: Disable vserver and xen. * debian/changelog: Update. * debian/patches/series/0experimental.1 - Remove patches marked as merged. - Disable patches which seems to be merged. - Move unmerged patches from 0experimental.2. * debian/patches/series/0experimental.2, debian/patches/series/0experimental.2-extra: Remove. svn path=/dists/trunk/linux-2.6/; revision=6179 --- debian/arch/amd64/defines | 4 ++-- debian/arch/i386/defines | 4 ++-- debian/arch/powerpc/defines | 3 ++- debian/changelog | 7 +++++-- debian/patches/series/0experimental.1 | 11 +++++------ debian/patches/series/0experimental.2 | 3 --- debian/patches/series/0experimental.2-extra | 1 - 7 files changed, 16 insertions(+), 17 deletions(-) delete mode 100644 debian/patches/series/0experimental.2 delete mode 100644 debian/patches/series/0experimental.2-extra diff --git a/debian/arch/amd64/defines b/debian/arch/amd64/defines index 9b61b2da6..9a1aac585 100644 --- a/debian/arch/amd64/defines +++ b/debian/arch/amd64/defines @@ -8,8 +8,8 @@ flavours: kernel-arch: x86_64 kernel-header-dirs: x86_64 subarches: - vserver - xen +# vserver +# xen [image] depends: e2fsprogs (>= 1.35-7) diff --git a/debian/arch/i386/defines b/debian/arch/i386/defines index cdfe6e3cf..3faeb7634 100644 --- a/debian/arch/i386/defines +++ b/debian/arch/i386/defines @@ -8,8 +8,8 @@ flavours: kernel-arch: i386 kernel-header-dirs: i386 subarches: - vserver - xen +# vserver +# xen [image] suggests: grub | lilo (>= 19.1) diff --git a/debian/arch/powerpc/defines b/debian/arch/powerpc/defines index 26d2abb91..298624ad7 100644 --- a/debian/arch/powerpc/defines +++ b/debian/arch/powerpc/defines @@ -7,7 +7,8 @@ flavours: kernel-header-dirs: powerpc ppc m68k kernel-arch: powerpc kpkg-subarch: ppc -subarches: vserver +subarches: +# vserver [image] diff --git a/debian/changelog b/debian/changelog index bdd0c367e..be128b8f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,7 @@ -linux-2.6 (2.6.15+2.6.16-rc5-0experimental.2) UNRELEASED; urgency=low +linux-2.6 (2.6.15+2.6.16-rc6-0experimental.1) UNRELEASED; urgency=low + + [ Bastian Blank ] + * New upstream release candidate. [ maximilian attems ] * Default to initramfs-tools on arm and armeb. @@ -10,7 +13,7 @@ linux-2.6 (2.6.15+2.6.16-rc5-0experimental.2) UNRELEASED; urgency=low [ dann frazier ] * [ia64] use yaird on ia64 until #341181 is fixed - -- dann frazier Sun, 12 Mar 2006 10:00:04 -0700 + -- Bastian Blank Mon, 13 Mar 2006 13:02:39 +0100 linux-2.6 (2.6.15+2.6.16-rc5-0experimental.1) experimental; urgency=low diff --git a/debian/patches/series/0experimental.1 b/debian/patches/series/0experimental.1 index 9d0c3794c..fcbf1e89f 100644 --- a/debian/patches/series/0experimental.1 +++ b/debian/patches/series/0experimental.1 @@ -4,7 +4,7 @@ + modular-ide-pnp.patch + version.patch # -+ mtdpart-redboot-fis-byteswap.patch +#merged + mtdpart-redboot-fis-byteswap.patch + ia64-irq-affinity-upfix.patch + powerpc-mkvmlinuz-support.patch + powerpc-build-links.patch @@ -16,11 +16,10 @@ + sparc64-hme-lockup.patch + sparc64-atyfb-xl-gr.patch + mips-makefile.patch -+ mips-arch-makefile.patch -+ mips-fix_iomap_nonpci.patch +#maybe merged + mips-arch-makefile.patch + mips-gettimeofday.patch + mips-ide-scan.patch + mips-sb1-probe-ide.patch -+ mips-ip22zilog_oops.patch -+ mips-scache-fix.patch -+ mips-linus-merge-post-rc5 +#merged + mips-ip22zilog_oops.patch ++ s390-drivers-ccw-uevent-modalias.patch ++ s390-drivers-ccw-uevent-cleanup.patch diff --git a/debian/patches/series/0experimental.2 b/debian/patches/series/0experimental.2 deleted file mode 100644 index 06585c02b..000000000 --- a/debian/patches/series/0experimental.2 +++ /dev/null @@ -1,3 +0,0 @@ -+ s390-scripts-modpost-ccw.patch -+ s390-drivers-ccw-uevent-modalias.patch -+ s390-drivers-ccw-uevent-cleanup.patch diff --git a/debian/patches/series/0experimental.2-extra b/debian/patches/series/0experimental.2-extra deleted file mode 100644 index 2b051007b..000000000 --- a/debian/patches/series/0experimental.2-extra +++ /dev/null @@ -1 +0,0 @@ -+ xen-tree-merge-21966-update.patch *_xen