[kernel] r9182 - in dists/trunk/linux-2.6/debian: . arch/alpha arch/amd64 arch/i386 arch/ia64 arch/powerpc arch/s390 arch/sparc patches/series

Maximilian Attems maks at alioth.debian.org
Mon Jul 23 13:37:46 UTC 2007 

Author: maks
Date: Mon Jul 23 13:37:45 2007
New Revision: 9182

Log:
prepare work for 2.6.23-rc1
usual patch fallout including reportoldconfig
+ vserver disabling + m68k merge


Modified:
   dists/trunk/linux-2.6/debian/arch/alpha/defines
   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/ia64/defines
   dists/trunk/linux-2.6/debian/arch/powerpc/defines
   dists/trunk/linux-2.6/debian/arch/s390/defines
   dists/trunk/linux-2.6/debian/arch/sparc/defines
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra

Modified: dists/trunk/linux-2.6/debian/arch/alpha/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/alpha/defines	Mon Jul 23 13:37:45 2007
@@ -3,7 +3,7 @@
 kernel-arch: alpha
 kernel-header-dirs: alpha
 subarches:
- vserver
+# vserver
 
 [image]
 suggests: aboot, fdutils

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 Jul 23 13:37:45 2007
@@ -4,7 +4,7 @@
 kernel-arch: x86_64
 kernel-header-dirs: x86_64 i386
 subarches:
- vserver
+# vserver
 # xen
 # xen-vserver
 

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 Jul 23 13:37:45 2007
@@ -8,7 +8,7 @@
 kernel-arch: i386
 kernel-header-dirs: i386 x86_64
 subarches:
- vserver
+# vserver
 # xen
 # xen-vserver
 

Modified: dists/trunk/linux-2.6/debian/arch/ia64/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/ia64/defines	Mon Jul 23 13:37:45 2007
@@ -5,7 +5,7 @@
 kernel-arch: ia64
 kernel-header-dirs: ia64
 subarches:
- vserver
+# vserver
 
 [image]
 suggests: elilo, fdutils

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 Jul 23 13:37:45 2007
@@ -10,7 +10,7 @@
 kernel-arch: powerpc
 kpkg-subarch: ppc
 subarches:
- vserver
+# vserver
 
 [image]
 type: plain

Modified: dists/trunk/linux-2.6/debian/arch/s390/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/s390/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/s390/defines	Mon Jul 23 13:37:45 2007
@@ -6,7 +6,7 @@
 kernel-arch: s390
 kernel-header-dirs: s390
 subarches:
- vserver
+# vserver
 
 [image]
 desc: This kernel has support to IPL (boot) from a VM reader or DASD device.

Modified: dists/trunk/linux-2.6/debian/arch/sparc/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/sparc/defines	Mon Jul 23 13:37:45 2007
@@ -5,7 +5,7 @@
  sparc64-smp
 kernel-header-dirs: sparc sparc64
 subarches:
- vserver
+# vserver
 
 [image]
 suggests: silo, fdutils

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Jul 23 13:37:45 2007
@@ -1,8 +1,9 @@
-linux-2.6 (2.6.22-trunk.1) UNRELEASED; urgency=low
+linux-2.6 (2.6.23~rc1-1~experimental.1) UNRELEASED; urgency=low
 
+  [ Bastian Blank ]
   *
 
- -- Bastian Blank <waldi at debian.org>  Tue, 17 Jul 2007 11:42:51 +0200
+ -- maximilian attems <maks at debian.org>  Mon, 23 Jul 2007 15:33:15 +0200
 
 linux-2.6 (2.6.22-2) UNRELEASED; urgency=low
 

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Mon Jul 23 13:37:45 2007
@@ -1,11 +1,11 @@
 + debian/version.patch
 + debian/kernelvariables.patch
 + debian/doc-build-parallel.patch
-+ debian/scripts-kconfig-reportoldconfig.patch
+#+ debian/scripts-kconfig-reportoldconfig.patch
 + debian/powerpc-mkvmlinuz-support-ppc.patch
-+ debian/powerpc-mkvmlinuz-support-powerpc.patch
+#+ debian/powerpc-mkvmlinuz-support-powerpc.patch
 
-+ debian/drivers-ata-ata_piix-postpone-pata.patch
+#+ debian/drivers-ata-ata_piix-postpone-pata.patch
 
 + bugfix/powerpc/build-links.patch
 + bugfix/powerpc/mv643xx-hotplug-support.patch
@@ -13,28 +13,28 @@
 + bugfix/powerpc/prep-utah-ide-interrupt.patch
 + bugfix/powerpc/serial.patch
 + bugfix/mips/ide-scan.patch
-+ bugfix/mips/ip22-zilog-console.patch
+#+ bugfix/mips/ip22-zilog-console.patch
 + bugfix/mips/sgi-ioc3.patch
 + bugfix/mips/64bit-tulip.patch
 + bugfix/mips/tulip_dc21143.patch
 + bugfix/mips/cobalt-ide-resources.patch
 + features/mips/qemu-vga.patch
-+ features/mips/sb1-duart.patch
-+ features/arm/ixp4xx-npe-driver-0.3.1.patch
-+ features/arm/ixp4xx-net-driver-improve-mac-handling.patch
+#+ features/mips/sb1-duart.patch
+#+ features/arm/ixp4xx-npe-driver-0.3.1.patch
+#+ features/arm/ixp4xx-net-driver-improve-mac-handling.patch
 + features/arm/nslu2-i2c-gpio-driver-support.patch
 + features/arm/nas100d-i2c-gpio-driver-support.patch
 + features/arm/nslu2-mac_plat_info.patch
 + features/arm/nas100d-mac_plat_info.patch
 + features/arm/nslu2-setup-mac.patch
 + features/arm/nas100d-setup-mac.patch
-+ bugfix/drivers-bus_to_virt.patch
+#+ bugfix/drivers-bus_to_virt.patch
 + bugfix/sparc/drivers_net-broken.patch
-+ bugfix/arm/rtc-rs5c372-n2100.patch
+#+ bugfix/arm/rtc-rs5c372-n2100.patch
 + bugfix/forcedeth-napi-broken.patch
 #+ bugfix/powerpc/drivers_macintosh-broken.patch
 + bugfix/ia64/hardcode-arch-script-output.patch
 + features/fintek-f75375.patch
-+ features/alpha/isa-mapping-support.patch
+#+ features/alpha/isa-mapping-support.patch
 + bugfix/powerpc/libgcc-__ucmpdi2.patch
-+ bugfix/arm/disable-broken-config-options-1.patch
+#+ bugfix/arm/disable-broken-config-options-1.patch

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra	Mon Jul 23 13:37:45 2007
@@ -8,7 +8,7 @@
 
 + bugfix/m68k/m68k-page.h-needs-compiler.h.diff m68k
 + bugfix/m68k/630-extern-cleanup.diff.1 m68k
-+ bugfix/m68k/633-atari_scc.diff m68k
+#+ bugfix/m68k/633-atari_scc.diff m68k
 + bugfix/m68k/130-adbraw.diff m68k
 #+ bugfix/m68k/133-arch.diff m68k
 #+ bugfix/m68k/134-atari-fat.diff m68k
@@ -19,33 +19,33 @@
 + bugfix/m68k/448-ide.diff m68k
 + bugfix/m68k/478-serial.diff m68k
 #+ bugfix/m68k/631-thread_stack.diff m68k
-+ bugfix/m68k/atari-rom-isa.diff m68k
-+ bugfix/m68k/atari-ethernec.diff m68k
+#+ bugfix/m68k/atari-rom-isa.diff m68k
+#+ bugfix/m68k/atari-ethernec.diff m68k
 + bugfix/m68k/unnecessary-m68k_memoffset.diff m68k
-+ bugfix/m68k/atari-aranym.diff m68k
-+ bugfix/m68k/ethernec-work.diff m68k
-+ bugfix/m68k/nfeth-virt_to_phys.diff m68k
-+ bugfix/m68k/ethernec-kill-ETHERNEC_USE_POLL.diff m68k
+#+ bugfix/m68k/atari-aranym.diff m68k
+#+ bugfix/m68k/ethernec-work.diff m68k
+#+ bugfix/m68k/nfeth-virt_to_phys.diff m68k
+#+ bugfix/m68k/ethernec-kill-ETHERNEC_USE_POLL.diff m68k
 #+ bugfix/m68k/sun3-3x-cg3-bw2.diff m68k
 #+ bugfix/m68k/sun3-3x-serial.diff m68k
-+ bugfix/m68k/m68k-generic-io.diff m68k
-+ bugfix/m68k/m68k-mvme-scsi-rename.diff m68k
-+ bugfix/m68k/m68k-53c700-scsi.diff m68k
+#+ bugfix/m68k/m68k-generic-io.diff m68k
+#+ bugfix/m68k/m68k-mvme-scsi-rename.diff m68k
+#+ bugfix/m68k/m68k-53c700-scsi.diff m68k
 + bugfix/m68k/via-pmu68k-dead-code.diff m68k
 + bugfix/m68k/m68k-use-_AC.diff m68k
-+ bugfix/m68k/m68k-amiga-z2ram-kill-TRUE-FALSE.diff m68k
-+ bugfix/m68k/add-termios2.diff m68k
+#+ bugfix/m68k/m68k-amiga-z2ram-kill-TRUE-FALSE.diff m68k
+#+ bugfix/m68k/add-termios2.diff m68k
 + bugfix/m68k/m68k-arbitary-speed-tty-support.diff m68k
 + bugfix/m68k/m68k-do-not-include-RODATA-in-text-segment.diff m68k
-+ bugfix/m68k/m68k-53c700-cleanups.diff m68k
-+ bugfix/m68k/split-amiga7xx.diff m68k
+#+ bugfix/m68k/m68k-53c700-cleanups.diff m68k
+#+ bugfix/m68k/split-amiga7xx.diff m68k
 + bugfix/m68k/m68k-scsi-Kconfig-hickups.diff m68k
-+ bugfix/m68k/zorro_config_attr-read-only.diff m68k
+#+ bugfix/m68k/zorro_config_attr-read-only.diff m68k
 + bugfix/m68k/zorro-module-device-table.diff m68k
 + bugfix/m68k/falconide_intr_lock-ratelimit.diff m68k
 
 + bugfix/m68k/dmasound_paula.diff m68k
-+ bugfix/m68k/disable-mac-broken-config-options.diff m68k
+#+ bugfix/m68k/disable-mac-broken-config-options.diff m68k
 
 #+ bugfix/m68k/debian-2.6.21-2-atari-scsi.diff m68k
-+ bugfix/m68k/debian-2.6.21-2-rom-isa.diff m68k
+#+ bugfix/m68k/debian-2.6.21-2-rom-isa.diff m68k

More information about the Kernel-svn-changes mailing list