[kernel] r8448 - in dists/trunk/linux-2.6/debian: . arch/amd64 arch/i386 arch/powerpc arch/s390 arch/sparc patches/bugfix patches/bugfix/all/stable patches/bugfix/arm patches/series

Bastian Blank waldi at alioth.debian.org
Tue Apr 10 12:22:48 UTC 2007 

Author: waldi
Date: Tue Apr 10 12:22:48 2007
New Revision: 8448

Added:
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
      - copied, changed from r8437, dists/trunk/linux-2.6/debian/patches/series/1
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra
      - copied unchanged from r8437, dists/trunk/linux-2.6/debian/patches/series/1-extra
Removed:
   dists/trunk/linux-2.6/debian/patches/bugfix/2.6.20.3
   dists/trunk/linux-2.6/debian/patches/bugfix/2.6.20.4
   dists/trunk/linux-2.6/debian/patches/bugfix/2.6.20.5
   dists/trunk/linux-2.6/debian/patches/bugfix/2.6.20.6
   dists/trunk/linux-2.6/debian/patches/bugfix/Makefile-localversion-backup.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.20.1
   dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.20.2
   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/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/bugfix/arm/disable-broken-config-options.patch
Log:
Update to 2.6.21-rc6.

* debian/arch: Disable vserver.
* debian/changelog: Update.
* debian/patches
  - Remove know merged patches.
  - Disable non working ones.
  - Fix some.


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	Tue Apr 10 12:22:48 2007
@@ -4,8 +4,8 @@
 kernel-arch: x86_64
 kernel-header-dirs: x86_64 i386
 subarches:
- vserver
- xen
+# vserver
+# xen
 # xen-vserver
 
 [image]

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	Tue Apr 10 12:22:48 2007
@@ -8,8 +8,8 @@
 kernel-arch: i386
 kernel-header-dirs: i386 x86_64
 subarches:
- vserver
- xen
+# vserver
+# xen
 # xen-vserver
 
 [image]

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	Tue Apr 10 12:22:48 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	Tue Apr 10 12:22:48 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	Tue Apr 10 12:22:48 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	Tue Apr 10 12:22:48 2007
@@ -1,3 +1,9 @@
+linux-2.6 (2.6.21~rc6-1~experimental.1) UNRELEASED; urgency=low
+
+  * 
+
+ -- Bastian Blank <waldi at debian.org>  Tue, 10 Apr 2007 14:08:21 +0200
+
 linux-2.6 (2.6.20-2) UNRELEASED; urgency=low
 
   * Rename linux-libc-headers into linux-libc-dev. 

Modified: dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-broken-config-options.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-broken-config-options.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-broken-config-options.patch	Tue Apr 10 12:22:48 2007
@@ -73,6 +73,6 @@
  	tristate "S3 Savage support"
 -	depends on FB && PCI && EXPERIMENTAL
 +	depends on FB && PCI && EXPERIMENTAL && (!ARM || BROKEN)
- 	select I2C_ALGOBIT if FB_SAVAGE_I2C
- 	select I2C if FB_SAVAGE_I2C
- 	select FB_DDC if FB_SAVAGE_I2C
+ 	select FB_MODE_HELPERS
+	select FB_CFB_FILLRECT
+	select FB_CFB_COPYAREA

Copied: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 (from r8437, 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~experimental.1	Tue Apr 10 12:22:48 2007
@@ -17,28 +17,21 @@
 + bugfix/mips/64bit-tulip.patch
 + bugfix/mips/tulip_dc21143.patch
 + features/mips/qemu-vga.patch
-+ features/mips/sb1-duart.patch
+#+ features/mips/sb1-duart.patch
 + features/arm/nslu2-setup-mac.patch
 + 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/Makefile-localversion-backup.patch
 + bugfix/drivers-bus_to_virt.patch
 + bugfix/arm/disable-broken-config-options.patch
-+ bugfix/arm/cyber2010_burst.patch
+#+ bugfix/arm/cyber2010_burst.patch
 + bugfix/arm/rtc-rs5c372-n2100.patch
 + bugfix/arm/n2100-r8169-parity.patch
 + features/alpha/alpha-prctl.patch
 + bugfix/alpha/asm-subarchs.patch
 + bugfix/sparc/drivers_net-broken.patch
 + bugfix/forcedeth-napi-broken.patch
-+ bugfix/all/stable/2.6.20.1
-+ bugfix/all/stable/2.6.20.2
 + bugfix/powerpc/drivers_macintosh-broken.patch
-+ bugfix/2.6.20.3
 + bugfix/ia64/hardcode-arch-script-output.patch
-+ bugfix/2.6.20.4
-+ bugfix/2.6.20.5
-+ bugfix/2.6.20.6

More information about the Kernel-svn-changes mailing list