[kernel] r6533 - in dists/trunk/linux-2.6/debian: .

[Bastian Blank]

Author: waldi
Date: Mon May  8 16:40:33 2006
New Revision: 6533

Modified:
   dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
   dists/trunk/linux-2.6/debian/arch/arm/config.rpc
   dists/trunk/linux-2.6/debian/changelog

Log:
Merge /dists/sid/linux-2.6.


Modified: dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	Mon May  8 16:40:33 2006
@@ -1122,7 +1122,7 @@
 CONFIG_JFFS2_ZLIB=y
 CONFIG_JFFS2_RTIME=y
 # CONFIG_JFFS2_RUBIN is not set
-# CONFIG_CRAMFS is not set
+CONFIG_CRAMFS=y
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.rpc
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.rpc	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.rpc	Mon May  8 16:40:33 2006
@@ -840,7 +840,7 @@
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
+CONFIG_CRAMFS=y
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Mon May  8 16:40:33 2006
@@ -11,16 +11,64 @@
 
  -- Frederik Schüler <fs at debian.org>  Sun,  7 May 2006 17:06:29 +0200
 
-linux-2.6 (2.6.16-11) UNRELEASED; urgency=low
+linux-2.6 (2.6.16-13) UNRELEASED; urgency=low
+
+  [ Frederik Schüler ]
+  * Add stable release 2.6.16.14:
+    - smbfs chroot issue (CVE-2006-1864)
+
+ -- Frederik Schüler <fs at debian.org>  Fri,  5 May 2006 08:54:42 +0200
+
+linux-2.6 (2.6.16-12) unstable; urgency=low
+
+  [ Bastian Blank ]
+  * Add stable release 2.6.16.12:
+    - dm snapshot: fix kcopyd destructor
+    - x86_64: Pass -32 to the assembler when compiling the 32bit vsyscall pages
+    - for_each_possible_cpu
+    - Simplify proc/devices and fix early termination regression
+    - sonypi: correct detection of new ICH7-based laptops
+    - MIPS: Fix tx49_blast_icache32_page_indexed.
+    - NET: e1000: Update truesize with the length of the packet for packet split
+    - i386: fix broken FP exception handling
+    - tipar oops fix
+    - USB: fix array overrun in drivers/usb/serial/option.c
+    - Altix snsc: duplicate kobject fix
+    - Alpha: strncpy() fix
+    - LSM: add missing hook to do_compat_readv_writev()
+    - Fix reiserfs deadlock
+    - make vm86 call audit_syscall_exit
+    - fix saa7129 support in saa7127 module for pvr350 tv out
+    - dm flush queue EINTR
+    - get_dvb_firmware: download nxt2002 firmware from new driver location
+    - cxusb-bluebird: bug-fix: power down corrupts frontend
+    - x86_64: Fix a race in the free_iommu path.
+    - MIPS: Use "R" constraint for cache_op.
+    - MIPS: R2 build fixes for gcc < 3.4.
+    - cs5535_gpio.c: call cdev_del() during module_exit to unmap kobject references and other cleanups
+    - MIPS: Fix branch emulation for floating-point exceptions.
+    - x86/PAE: Fix pte_clear for the >4GB RAM case
+  * Add stable release 2.6.16.13:
+    - NETFILTER: SCTP conntrack: fix infinite loop (CVE-2006-1527)
+  * Remove merged patches.
+  * Rediff xen patch.
+  * Bump build-dependency on kernel-package to 10.047.
+
+  [ Martin Michlmayr ]
+  * [arm] Enable cramfs for ixp4xx and rpc.
+
+ -- Bastian Blank <waldi at debian.org>  Thu,  4 May 2006 11:37:26 +0200
+
+linux-2.6 (2.6.16-11) unstable; urgency=low
 
   * Update vserver patch to 2.0.2-rc18.
-    - Limit ccaps to root inside a guest
+    - Limit ccaps to root inside a guest (CVE-2006-2110)
   * Conflict with known broken grub versions. (closes: #361308)
-  * Enable s390 vserver image. 
+  * Enable s390 vserver image.
   * Enable xen and xen-vserver images.
   * Use localversion for kernel-package images. (closes: #365505)
 
- -- Bastian Blank <waldi at debian.org>  Sun, 30 Apr 2006 19:50:52 +0200
+ -- Bastian Blank <waldi at debian.org>  Mon,  1 May 2006 16:38:45 +0200
 
 linux-2.6 (2.6.16-10) unstable; urgency=low