[kernel] r18857 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/features/all/rt patches/series

[Bastian Blank]

Author: waldi
Date: Mon Mar 19 17:13:02 2012
New Revision: 18857

Log:
* debian/changelog: Set version to 3.2.12-1.
* debian/patches: Remove merged and fix-up patches.

Deleted:
   dists/sid/linux-2.6/debian/patches/bugfix/all/ipsec-be-careful-of-non-existing-mac-headers.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/features/all/rt/drivers-net-fix-livelock-issues.patch
   dists/sid/linux-2.6/debian/patches/series/base

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Mar 19 13:51:17 2012	(r18856)
+++ dists/sid/linux-2.6/debian/changelog	Mon Mar 19 17:13:02 2012	(r18857)
@@ -1,4 +1,8 @@
-linux-2.6 (3.2.10-2) UNRELEASED; urgency=low
+linux-2.6 (3.2.12-1) UNRELEASED; urgency=low
+
+  * New upstream stable update:
+    http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.11
+    http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.12
 
   [ Ben Hutchings ]
   * [powerpc] Enable KVM_GUEST

Modified: dists/sid/linux-2.6/debian/patches/features/all/rt/drivers-net-fix-livelock-issues.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/rt/drivers-net-fix-livelock-issues.patch	Mon Mar 19 13:51:17 2012	(r18856)
+++ dists/sid/linux-2.6/debian/patches/features/all/rt/drivers-net-fix-livelock-issues.patch	Mon Mar 19 17:13:02 2012	(r18857)
@@ -36,9 +36,9 @@
 -	}
 +	spin_lock_irqsave(&adapter->tx_lock, flags);
 +
- 	if (skb->mark == 0x01)
- 		type = atl1c_trans_high;
- 	else
+ 
+ 	if (atl1c_tpd_avail(adapter, type) < tpd_req) {
+ 		/* no enough descriptor, just stop queue */
 Index: linux-3.2/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
 ===================================================================
 --- linux-3.2.orig/drivers/net/ethernet/atheros/atl1e/atl1e_main.c

Modified: dists/sid/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/base	Mon Mar 19 13:51:17 2012	(r18856)
+++ dists/sid/linux-2.6/debian/patches/series/base	Mon Mar 19 17:13:02 2012	(r18857)
@@ -75,7 +75,6 @@
 
 + bugfix/x86/drm-i915-do-not-enable-RC6p-on-Sandy-Bridge.patch
 + bugfix/x86/drm-i915-fix-operator-precedence-when-enabling-RC6p.patch
-+ bugfix/all/ipsec-be-careful-of-non-existing-mac-headers.patch
 
 + features/all/fs-symlink-restrictions-on-sticky-directories.patch
 + features/all/fs-symlink-restrictions-on-sticky-directories-fix-2.patch