[kernel] r6179 - in dists/trunk/linux-2.6/debian: . arch/amd64 arch/i386 arch/powerpc patches/series

[Bastian Blank]

Author: waldi
Date: Mon Mar 13 12:59:02 2006
New Revision: 6179

Removed:
   dists/trunk/linux-2.6/debian/patches/series/0experimental.2
   dists/trunk/linux-2.6/debian/patches/series/0experimental.2-extra
Modified:
   dists/trunk/linux-2.6/debian/arch/amd64/defines
   dists/trunk/linux-2.6/debian/arch/i386/defines
   dists/trunk/linux-2.6/debian/arch/powerpc/defines
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/0experimental.1
Log:
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.


Modified: dists/trunk/linux-2.6/debian/arch/amd64/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/defines	Mon Mar 13 12:59:02 2006
@@ -8,8 +8,8 @@
 kernel-arch: x86_64
 kernel-header-dirs: x86_64
 subarches:
- vserver
- xen
+# vserver
+# xen
 
 [image]
 depends: e2fsprogs (>= 1.35-7)

Modified: dists/trunk/linux-2.6/debian/arch/i386/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/defines	Mon Mar 13 12:59:02 2006
@@ -8,8 +8,8 @@
 kernel-arch: i386
 kernel-header-dirs: i386
 subarches:
- vserver
- xen
+# vserver
+# xen
 
 [image]
 suggests: grub | lilo (>= 19.1)

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/defines	Mon Mar 13 12:59:02 2006
@@ -7,7 +7,8 @@
 kernel-header-dirs: powerpc ppc m68k
 kernel-arch: powerpc
 kpkg-subarch: ppc
-subarches: vserver
+subarches:
+# vserver
 
 [image]
 

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Mar 13 12:59:02 2006
@@ -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 @@
   [ dann frazier ]
   * [ia64] use yaird on ia64 until #341181 is fixed
 
- -- dann frazier <dannf at debian.org>  Sun, 12 Mar 2006 10:00:04 -0700
+ -- Bastian Blank <waldi at debian.org>  Mon, 13 Mar 2006 13:02:39 +0100
 
 linux-2.6 (2.6.15+2.6.16-rc5-0experimental.1) experimental; urgency=low
 

Modified: dists/trunk/linux-2.6/debian/patches/series/0experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/0experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/0experimental.1	Mon Mar 13 12:59:02 2006
@@ -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