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

[Frederik Schüler]

Author: fschueler-guest
Date: Sun Nov 20 15:42:19 2005
New Revision: 4855

Added:
   dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc2-0experimental.1
Removed:
   dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc1-0experimental.1
Modified:
   dists/trunk/linux-2.6/debian/arch/amd64/config
   dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-generic
   dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8
   dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8-smp
   dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4
   dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4-smp
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/changelog
Log:
Update to 2.6.15-rc2


Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config	Sun Nov 20 15:42:19 2005
@@ -1653,3 +1653,4 @@
 CONFIG_I6300ESB_WDT=m
 CONFIG_USB_SUSPEND=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_PM_LEGACY=y

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-generic
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-generic	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-generic	Sun Nov 20 15:42:19 2005
@@ -51,3 +51,4 @@
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 # CONFIG_DISCONTIGMEM_MANUAL is not set
+CONFIG_X86_MCE_AMD=y

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8	Sun Nov 20 15:42:19 2005
@@ -51,3 +51,4 @@
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 # CONFIG_DISCONTIGMEM_MANUAL is not set
+CONFIG_X86_MCE_AMD=y

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8-smp	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8-smp	Sun Nov 20 15:42:19 2005
@@ -13,7 +13,6 @@
 CONFIG_NUMA=y
 CONFIG_HAVE_DEC_LOCK=y
 CONFIG_NR_CPUS=32
-# CONFIG_ACPI_NUMA is not set
 # CONFIG_CPU_FREQ_STAT_DETAILS is not set
 # CONFIG_R8169_VLAN is not set
 CONFIG_FB_MATROX_G=y
@@ -33,3 +32,6 @@
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_DISCONTIGMEM=y
 CONFIG_DISCONTIGMEM_MANUAL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_64_ACPI_NUMA=y
+CONFIG_ACPI_NUMA=y

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4	Sun Nov 20 15:42:19 2005
@@ -51,3 +51,4 @@
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 # CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_X86_MCE_AMD is not set

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4-smp	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4-smp	Sun Nov 20 15:42:19 2005
@@ -27,3 +27,4 @@
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 # CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_X86_MCE_AMD is not set

Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/config	Sun Nov 20 15:42:19 2005
@@ -731,3 +731,8 @@
 CONFIG_SCTP_HMAC_MD5=y
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_TELCLOCK=m
+CONFIG_CARDMAN_4000=m
+CONFIG_USB_SERIAL_ANYDATA=m
+CONFIG_VIDEO_DECODER=m
+CONFIG_VIDEO_AUDIO_DECODER=m
+CONFIG_CARDMAN_4040=m

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Nov 20 15:42:19 2005
@@ -1,10 +1,10 @@
-linux-2.6 (2.6.14+2.6.15-rc1-0experimental.1) UNRELEASED; urgency=low
+linux-2.6 (2.6.14+2.6.15-rc2-0experimental.1) UNRELEASED; urgency=low
 
   [ Frederik Schüler ]
   * New upstream release candidate.
   * Readdition of qla2xxx drivers, as firmware license has been fixed.
 
- -- Frederik Schüler <fschueler at gmx.net>  Sat, 12 Nov 2005 14:23:19 +0100
+ -- Frederik Schüler <fs at debian.org>  Sun, 20 Nov 2005 15:05:12 +0100
 
 linux-2.6 (2.6.14-3) unstable; urgency=low
 

Added: dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc2-0experimental.1
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc2-0experimental.1	Sun Nov 20 15:42:19 2005
@@ -0,0 +1,29 @@
+#+ amd64-int3-fix.patch
++ fbdev-radeon-noaccel.patch
++ fs-asfs-2.patch
++ ia64-irq-affinity-upfix.patch
+#+ modular-ide.patch
++ modular-ide-pnp.patch
+#+ powerpc-calibrate-tau.patch
+#+ powerpc-g3-750cxe.patch
++ powerpc-mkvmlinuz-support.patch
++ powerpc-serial.patch
+#+ qla2xxx-removed.patch
+#+ remove-references-to-removed-drivers.patch
++ sparc64-hme-lockup.patch
++ tty-locking-fixes9.patch
++ version.patch
+#+ powerpc-mv643xx-hotplug-support.patch
+#+ powerpc-apus.patch
+#+ s390-uaccess-const.patch
+#+ powerpc-build-links.patch
+#+ alpha-compile-fix.patch
+#+ powerpc64-audit_sysctl-build.patch
+#+ net-ipconntrack-nat-fix.patch
+#+ net-nf_queue-oops.patch
++ m68k-bvme.patch
++ m68k-mvme147.patch
++ m68k-mvme16x.patch
++ m68k-spinlock.patch
++ sparc64-atyfb-xl-gr.patch
+#- alpha-compile-fix.patch