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

Maximilian Attems maks at alioth.debian.org
Sun May 20 09:08:36 UTC 2007


Author: maks
Date: Sun May 20 09:08:35 2007
New Revision: 8612

Log:
rebase on latest 2.6.22-rc2:
* comment non applying patches
* remove obvious stable
* disable vserver


Removed:
   dists/trunk/linux-2.6/debian/patches/bugfix/2.6.21.1
   dists/trunk/linux-2.6/debian/patches/series/2
   dists/trunk/linux-2.6/debian/patches/series/2-extra
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/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
   dists/trunk/linux-2.6/debian/patches/series/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	Sun May 20 09:08:35 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	Sun May 20 09:08:35 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	Sun May 20 09:08:35 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/powerpc/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/defines	Sun May 20 09:08:35 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	Sun May 20 09:08:35 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	Sun May 20 09:08:35 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	Sun May 20 09:08:35 2007
@@ -1,3 +1,9 @@
+linux-2.6 (2.6.22~rc2-1) UNRELEASED; urgency=low
+
+  * New upstream rc release
+
+ -- maximilian attems <maks at debian.org>  Sun, 20 May 2007 11:05:20 +0200
+
 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low
 
   * sparc64: enable USB_SERIAL. (closes: #412740)

Modified: dists/trunk/linux-2.6/debian/patches/series/1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1	Sun May 20 09:08:35 2007
@@ -1,9 +1,9 @@
-+ debian/version.patch
+#+ debian/version.patch
 + debian/kernelvariables.patch
 + debian/doc-build-parallel.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
 
@@ -12,11 +12,11 @@
 + bugfix/powerpc/oldworld-boot-fix.patch
 + bugfix/powerpc/prep-utah-ide-interrupt.patch
 + bugfix/powerpc/serial.patch
-+ bugfix/mips/eth-napi.patch
+#+ bugfix/mips/eth-napi.patch
 + bugfix/mips/ide-scan.patch
 + bugfix/mips/ip22-zilog-console.patch
 + bugfix/mips/sgi-ioc3.patch
-+ bugfix/mips/64bit-tulip.patch
+#+ bugfix/mips/64bit-tulip.patch
 + bugfix/mips/tulip_dc21143.patch
 + features/mips/qemu-vga.patch
 + features/mips/sb1-duart.patch
@@ -24,16 +24,17 @@
 + features/arm/nslu2-eth-mac.patch
 + features/arm/nas100d-setup-mac.patch
 + features/arm/nas100d-eth-mac.patch
-+ features/arm/ixp4xx_npe_driver-0.3.1.patch
-+ features/arm/ixp4xx-net-driver-improve-mac-handling.patch
-+ bugfix/drivers-bus_to_virt.patch
+#+ features/arm/ixp4xx_npe_driver-0.3.1.patch
+#+ features/arm/ixp4xx-net-driver-improve-mac-handling.patch
+#+ bugfix/drivers-bus_to_virt.patch
 + bugfix/sparc/drivers_net-broken.patch
-+ bugfix/arm/disable-broken-config-options.patch
-+ bugfix/arm/disable-broken-config-options2.patch
+#+ bugfix/arm/disable-broken-config-options.patch
+#+ bugfix/arm/disable-broken-config-options2.patch
 + bugfix/arm/disable-broken-config-options3.patch
 + bugfix/arm/rtc-rs5c372-n2100.patch
-+ features/alpha/alpha-prctl.patch
+#+ features/alpha/alpha-prctl.patch
 + bugfix/forcedeth-napi-broken.patch
-+ bugfix/powerpc/drivers_macintosh-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

Modified: dists/trunk/linux-2.6/debian/patches/series/1-extra
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1-extra	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1-extra	Sun May 20 09:08:35 2007
@@ -7,54 +7,54 @@
 + bugfix/arm/nas100d-artop-temp-fix.patch arm
 
 # Integrated in 2.6.22-rc1
-+ bugfix/m68k/634-atari_scsi.diff m68k
-+ bugfix/m68k/atari-scsi-reformat.diff m68k
-+ bugfix/m68k/atari-scsi-compile-fixes.diff m68k
-+ bugfix/m68k/635-atari_input.diff m68k
-+ bugfix/m68k/636-atafb.diff m68k
-+ bugfix/m68k/m68k-linux-gnu-crosscompile.diff m68k
-+ bugfix/m68k/357-mac89x0.diff m68k
-+ bugfix/m68k/irq_lockdep.diff m68k
-+ bugfix/m68k/m68k-reformat.diff m68k
-+ bugfix/m68k/hilkbd-warning.diff m68k
-+ bugfix/m68k/early-param.diff m68k
-+ bugfix/m68k/sun3-numints.diff m68k
-+ bugfix/m68k/atari_NCR5380-work.diff m68k
-+ bugfix/m68k/pmu_queue_request-conflict.diff m68k
-+ bugfix/m68k/amiga-a2065-ariadne-stats.diff m68k
-+ bugfix/m68k/mac68k-remove-unused-adb-header.diff m68k
-+ bugfix/m68k/mac68k-patch_d-via-alt-mapping.diff m68k
-+ bugfix/m68k/mac68k-patch_A-mac68k_cvs_nubus_defines.diff m68k
-+ bugfix/m68k/mac68k-patch_B-mac68k_cvs_DP8390_update.diff m68k
-+ bugfix/m68k/mac68k-revert-remaining-irq-damage.diff m68k
-+ bugfix/m68k/mac68k-irq-prep.diff m68k
-+ bugfix/m68k/mac68k-irq-plan-e.diff m68k
-+ bugfix/m68k/mac68k-finish_irq_cleanup.diff m68k
-+ bugfix/m68k/mac68k-macii-adb-fixes.diff m68k
-+ bugfix/m68k/mac68k-cuda-adb-fixes.diff m68k
-+ bugfix/m68k/mac68k-macmace-fixes.diff m68k
-+ bugfix/m68k/mac68k-sonic-fixes.diff m68k
-+ bugfix/m68k/mac68k-macsonic-via-alt-mapping.diff m68k
-+ bugfix/m68k/zorro-resource_size_t-warnings.diff m68k
-+ bugfix/m68k/kmap_atomic-inline.diff m68k
+#+ bugfix/m68k/634-atari_scsi.diff m68k
+#+ bugfix/m68k/atari-scsi-reformat.diff m68k
+#+ bugfix/m68k/atari-scsi-compile-fixes.diff m68k
+#+ bugfix/m68k/635-atari_input.diff m68k
+#+ bugfix/m68k/636-atafb.diff m68k
+#+ bugfix/m68k/m68k-linux-gnu-crosscompile.diff m68k
+#+ bugfix/m68k/357-mac89x0.diff m68k
+#+ bugfix/m68k/irq_lockdep.diff m68k
+#+ bugfix/m68k/m68k-reformat.diff m68k
+#+ bugfix/m68k/hilkbd-warning.diff m68k
+#+ bugfix/m68k/early-param.diff m68k
+#+ bugfix/m68k/sun3-numints.diff m68k
+#+ bugfix/m68k/atari_NCR5380-work.diff m68k
+#+ bugfix/m68k/pmu_queue_request-conflict.diff m68k
+#+ bugfix/m68k/amiga-a2065-ariadne-stats.diff m68k
+#+ bugfix/m68k/mac68k-remove-unused-adb-header.diff m68k
+#+ bugfix/m68k/mac68k-patch_d-via-alt-mapping.diff m68k
+#+ bugfix/m68k/mac68k-patch_A-mac68k_cvs_nubus_defines.diff m68k
+#+ bugfix/m68k/mac68k-patch_B-mac68k_cvs_DP8390_update.diff m68k
+#+ bugfix/m68k/mac68k-revert-remaining-irq-damage.diff m68k
+#+ bugfix/m68k/mac68k-irq-prep.diff m68k
+#+ bugfix/m68k/mac68k-irq-plan-e.diff m68k
+#+ bugfix/m68k/mac68k-finish_irq_cleanup.diff m68k
+#+ bugfix/m68k/mac68k-macii-adb-fixes.diff m68k
+#+ bugfix/m68k/mac68k-cuda-adb-fixes.diff m68k
+#+ bugfix/m68k/mac68k-macmace-fixes.diff m68k
+#+ bugfix/m68k/mac68k-sonic-fixes.diff m68k
+#+ bugfix/m68k/mac68k-macsonic-via-alt-mapping.diff m68k
+#+ bugfix/m68k/zorro-resource_size_t-warnings.diff m68k
+#+ bugfix/m68k/kmap_atomic-inline.diff m68k
 # Submitted
 + bugfix/m68k/falconide_intr_lock-reentrant.diff m68k
-+ bugfix/m68k/577-module-arch.diff m68k
-+ bugfix/m68k/600-task_thread_info.diff m68k
+#+ bugfix/m68k/577-module-arch.diff m68k
+#+ bugfix/m68k/600-task_thread_info.diff m68k
 + bugfix/m68k/611-module_fixup.diff m68k
 + bugfix/m68k/618-discontig.diff m68k
 + bugfix/m68k/630-extern-cleanup.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
+#+ bugfix/m68k/134-atari-fat.diff m68k
 + bugfix/m68k/141-ide.diff m68k
 + bugfix/m68k/143-ioext.diff m68k
 + bugfix/m68k/149-mc68681.diff m68k
 + bugfix/m68k/152-pci.diff m68k
 + bugfix/m68k/448-ide.diff m68k
 + bugfix/m68k/478-serial.diff m68k
-+ bugfix/m68k/631-thread_stack.diff m68k
+#+ bugfix/m68k/631-thread_stack.diff m68k
 + bugfix/m68k/atari-rom-isa.diff m68k
 + bugfix/m68k/atari-ethernec.diff m68k
 + bugfix/m68k/unnecessary-m68k_memoffset.diff m68k
@@ -62,8 +62,8 @@
 + 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/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
@@ -71,3 +71,4 @@
 
 + bugfix/m68k/dmasound_paula.diff m68k
 + bugfix/m68k/disable-mac-broken-config-options.diff m68k
++ bugfix/m68k/633-atari_scc.diff m68k



More information about the Kernel-svn-changes mailing list