[kernel] r13840 - in dists/lenny/linux-2.6: . debian debian/patches/series

[Dann Frazier]

Author: dannf
Date: Sat Jun 20 16:17:08 2009
New Revision: 13840

Log:
merge in 2.6.26-17

Added:
   dists/lenny/linux-2.6/debian/patches/series/17
      - copied unchanged from r13839, releases/linux-2.6/2.6.26-17/debian/patches/series/17
   dists/lenny/linux-2.6/debian/patches/series/18-extra
      - copied unchanged from r13835, dists/lenny/linux-2.6/debian/patches/series/17-extra
Deleted:
   dists/lenny/linux-2.6/debian/patches/series/17-extra
Modified:
   dists/lenny/linux-2.6/   (props changed)
   dists/lenny/linux-2.6/debian/changelog

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Sat Jun 20 16:12:58 2009	(r13839)
+++ dists/lenny/linux-2.6/debian/changelog	Sat Jun 20 16:17:08 2009	(r13840)
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.26-17) stable; urgency=low
+linux-2.6 (2.6.26-18) UNRELEASED; urgency=high
 
   * [openvz] 19f7f85 net: bridge - process skbs has been already substituted
     due to via_phys_dev (closes: #532811)
@@ -8,6 +8,13 @@
 
  -- maximilian attems <maks at debian.org>  Wed, 10 Jun 2009 15:34:04 +0200
 
+linux-2.6 (2.6.26-17) stable; urgency=high
+
+  * Revert "sata_nv: avoid link reset on controllers where it's broken"
+    due to regression. (closes: #533657)
+
+ -- dann frazier <dannf at debian.org>  Fri, 19 Jun 2009 23:03:53 -0600
+
 linux-2.6 (2.6.26-16) stable; urgency=high
 
   [ maximilian attems ]

Copied: dists/lenny/linux-2.6/debian/patches/series/17 (from r13839, releases/linux-2.6/2.6.26-17/debian/patches/series/17)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/series/17	Sat Jun 20 16:17:08 2009	(r13840, copy of r13839, releases/linux-2.6/2.6.26-17/debian/patches/series/17)
@@ -0,0 +1 @@
+- bugfix/all/drivers-ata-sata_nv-broken-hardreset.patch

Copied: dists/lenny/linux-2.6/debian/patches/series/18-extra (from r13835, dists/lenny/linux-2.6/debian/patches/series/17-extra)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/series/18-extra	Sat Jun 20 16:17:08 2009	(r13840, copy of r13835, dists/lenny/linux-2.6/debian/patches/series/17-extra)
@@ -0,0 +1,3 @@
++ features/all/openvz/0084-net-bridge-process-skbs-has-been-already-substituted.patch featureset=openvz
++ features/all/openvz/0085-net-avoid-double-free-on-net-gen-pointer-on-error.patch featureset=openvz
++ features/all/openvz/0086-pidns-pi-futex-pid-check-fixup.patch featureset=openvz