[kernel] r11936 - in dists/etch-security/linux-2.6: . debian debian/patches/bugfix debian/patches/bugfix/mips debian/patches/features debian/patches/features/all/drivers debian/patches/features/all/xen debian/patches/series

[Dann Frazier]

Author: dannf
Date: Thu Jul 31 06:26:13 2008
New Revision: 11936

Log:
merge etch branch

Added:
   dists/etch-security/linux-2.6/debian/patches/bugfix/3w-xxxx-bigmem-corruption.patch
      - copied unchanged from r11913, /releases/linux-2.6/2.6.18.dfsg.1-22/debian/patches/bugfix/3w-xxxx-bigmem-corruption.patch
   dists/etch-security/linux-2.6/debian/patches/bugfix/dnotify-race-locking.patch
      - copied unchanged from r11913, /releases/linux-2.6/2.6.18.dfsg.1-22/debian/patches/bugfix/dnotify-race-locking.patch
   dists/etch-security/linux-2.6/debian/patches/bugfix/ia64-flush-i-cache-before-set_pte.patch
      - copied unchanged from r11913, /releases/linux-2.6/2.6.18.dfsg.1-22/debian/patches/bugfix/ia64-flush-i-cache-before-set_pte.patch
   dists/etch-security/linux-2.6/debian/patches/bugfix/mips/cobalt-raq1-uart.patch
      - copied unchanged from r11913, /releases/linux-2.6/2.6.18.dfsg.1-22/debian/patches/bugfix/mips/cobalt-raq1-uart.patch
   dists/etch-security/linux-2.6/debian/patches/bugfix/nfs-write-corruption.patch
      - copied unchanged from r11913, /releases/linux-2.6/2.6.18.dfsg.1-22/debian/patches/bugfix/nfs-write-corruption.patch
   dists/etch-security/linux-2.6/debian/patches/bugfix/x86-clear-df-before-calling-signal-handler.patch
      - copied unchanged from r11913, /releases/linux-2.6/2.6.18.dfsg.1-22/debian/patches/bugfix/x86-clear-df-before-calling-signal-handler.patch
   dists/etch-security/linux-2.6/debian/patches/features/all/drivers/3ware-9690sa.patch
      - copied unchanged from r11913, /releases/linux-2.6/2.6.18.dfsg.1-22/debian/patches/features/all/drivers/3ware-9690sa.patch
   dists/etch-security/linux-2.6/debian/patches/features/all/xen/evtchn-BUG.patch
      - copied unchanged from r11913, /releases/linux-2.6/2.6.18.dfsg.1-22/debian/patches/features/all/xen/evtchn-BUG.patch
   dists/etch-security/linux-2.6/debian/patches/features/e1000-quad-82571EB-ids.patch
      - copied unchanged from r11913, /releases/linux-2.6/2.6.18.dfsg.1-22/debian/patches/features/e1000-quad-82571EB-ids.patch
   dists/etch-security/linux-2.6/debian/patches/series/19
      - copied unchanged from r11913, /releases/linux-2.6/2.6.18.dfsg.1-22/debian/patches/series/19
   dists/etch-security/linux-2.6/debian/patches/series/21
      - copied unchanged from r11913, /releases/linux-2.6/2.6.18.dfsg.1-22/debian/patches/series/21
   dists/etch-security/linux-2.6/debian/patches/series/22
      - copied unchanged from r11913, /releases/linux-2.6/2.6.18.dfsg.1-22/debian/patches/series/22
   dists/etch-security/linux-2.6/debian/patches/series/22-extra
      - copied unchanged from r11913, /releases/linux-2.6/2.6.18.dfsg.1-22/debian/patches/series/22-extra
   dists/etch-security/linux-2.6/debian/patches/series/22etch1   (props changed)
      - copied unchanged from r11910, /dists/etch-security/linux-2.6/debian/patches/series/18etch7
Removed:
   dists/etch-security/linux-2.6/debian/patches/series/18etch7
Modified:
   dists/etch-security/linux-2.6/   (props changed)
   dists/etch-security/linux-2.6/debian/changelog

Modified: dists/etch-security/linux-2.6/debian/changelog
==============================================================================
--- dists/etch-security/linux-2.6/debian/changelog	(original)
+++ dists/etch-security/linux-2.6/debian/changelog	Thu Jul 31 06:26:13 2008
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.18.dfsg.1-18etch7) UNRELEASED; urgency=low
+linux-2.6 (2.6.18.dfsg.1-22etch1) stable-security; urgency=high
 
   * bugfix/sctp-make-sure-n-sizeof-does-not-overflow.patch
     [SECURITY] Fix potential overflow condition in
@@ -22,7 +22,53 @@
     [SECURITY][amd64] Fix memory leak in the copy_user routine, see #490910.
     See CVE-2008-0598
 
- -- dann frazier <dannf at debian.org>  Tue, 15 Jul 2008 23:57:07 -0700
+ -- dann frazier <dannf at debian.org>  Sun, 27 Jul 2008 16:06:38 -0600
+
+linux-2.6 (2.6.18.dfsg.1-22) stable; urgency=high
+
+  [ dann frazier ]
+  * Merge in changes from 2.6.18.dfsg.1-18etch6
+
+  [ Frederik Schüler ]
+  * 3w-9xxx: Add 3ware 9690SA Backport (closes: #479773)
+
+  [ Ian Campbell ]
+  * Backport http://xenbits.xensource.com/xen-unstable.hg?rev/914304b3a3da,
+    fixing kernel BUG at drivers/xen/core/evtchn.c:481 (closes: #410807).
+
+ -- dann frazier <dannf at debian.org>  Mon, 16 Jun 2008 16:15:54 -0600
+
+linux-2.6 (2.6.18.dfsg.1-21) stable; urgency=high
+
+  * 3w-xxxx: Fix data corruption on em64t systems w/ > 2GB of memory
+    (closes: #464923).
+  * Merge in changes from 2.6.18.dfsg.1-18etch[2-5]
+  * Add missing locking for the dnotify-race fix that was included in
+    the upstream commit
+
+ -- dann frazier <dannf at debian.org>  Fri, 30 May 2008 00:55:05 -0600
+
+linux-2.6 (2.6.18.dfsg.1-20) stable; urgency=high
+
+  [ Bastian Blank ]
+  * Merge in changes from 2.6.18.dfsg.1-18etch1.
+
+ -- dann frazier <dannf at debian.org>  Fri, 04 Apr 2008 11:16:56 -0600
+
+linux-2.6 (2.6.18.dfsg.1-19) stable; urgency=high
+
+  [ Martin Michlmayr ]
+  * [mips] Enable UART on RaQ1 (closes: #473824).
+
+  [ dann frazier ]
+  * e1000: Add PCI-IDs for 82571EB 4-port cards (closes: #466401).
+  * Fix potential nfs write corruption (closes: #470719)
+  * [ia64] Fix multi-thread/nfs text corruption (closes: #471427).
+
+  [ Bastian Blank ]
+  * [i386/amd64] Clear DF before calling signal handler. (closes: #469058)
+
+ -- dann frazier <dannf at debian.org>  Thu, 03 Apr 2008 16:22:55 -0600
 
 linux-2.6 (2.6.18.dfsg.1-18etch6) stable-security; urgency=high