r4081 - in branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches: . series

[Simon Horman]

Author: horms
Date: 2005-08-31 08:51:17 +0000 (Wed, 31 Aug 2005)
New Revision: 4081

Modified:
   branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/genelink-usbnet-skb-typo.dpatch
   branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/nptl-signal-delivery-deadlock-fix.dpatch
   branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17
Log:
Add some comments

Modified: branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/genelink-usbnet-skb-typo.dpatch
===================================================================
--- branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/genelink-usbnet-skb-typo.dpatch	2005-08-31 08:40:55 UTC (rev 4080)
+++ branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/genelink-usbnet-skb-typo.dpatch	2005-08-31 08:51:17 UTC (rev 4081)
@@ -1,5 +1,6 @@
-From linux-kernel-owner+chrisw=40osdl.org-S1751397AbVHVWiz at vger.kernel.org  Mon Aug 22 15:40:19 2005
-Date: 	Mon, 22 Aug 2005 14:02:39 +0800
+From linux-kernel-owner+chrisw=40osdl.org-S1751397AbVHVWiz at vger.kernel.org
+Mon Aug 22 15:40:19 2005
+Date:   Mon, 22 Aug 2005 14:02:39 +0800
 From: lepton <ytht.net at gmail.com>
 To: dbrownell at users.sourceforge.net
 Cc: linux-kernel at vger.kernel.org
@@ -15,11 +16,11 @@
  drivers/usb/net/usbnet.c |    2 +-
  1 files changed, 1 insertion(+), 1 deletion(-)
 
-Index: linux-2.6.12.y/drivers/usb/net/usbnet.c
-===================================================================
---- linux-2.6.12.y.orig/drivers/usb/net/usbnet.c
-+++ linux-2.6.12.y/drivers/usb/net/usbnet.c
-@@ -1922,7 +1922,7 @@ static int genelink_rx_fixup (struct usb
+Backported to Debian'2 2.6.8 by Horms
+
+--- a/drivers/usb/net/usbnet.c.orig	2005-08-31 17:36:53.000000000 +0900
++++ b/drivers/usb/net/usbnet.c	2005-08-31 17:37:12.000000000 +0900
+@@ -1490,7 +1490,7 @@
  
  			// copy the packet data to the new skb
  			memcpy(skb_put(gl_skb, size), packet->packet_data, size);

Modified: branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/nptl-signal-delivery-deadlock-fix.dpatch
===================================================================
--- branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/nptl-signal-delivery-deadlock-fix.dpatch	2005-08-31 08:40:55 UTC (rev 4080)
+++ branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/nptl-signal-delivery-deadlock-fix.dpatch	2005-08-31 08:51:17 UTC (rev 4081)
@@ -1,3 +1,30 @@
+From linux-kernel-owner+chrisw=40osdl.org-S1751189AbVHQS3c at vger.kernel.org
+Wed Aug 17 11:30:11 2005
+From: "Bhavesh P. Davda" <bhavesh at avaya.com>
+To: linux-kernel at vger.kernel.org, torvalds at osdl.org
+Cc: "Kathleen Glass" <kkglass at avaya.com>, "James E Rhodes"
+<jrhodes at avaya.com>
+Subject: [PATCH] NPTL signal delivery deadlock fix
+
+This bug is quite subtle and only happens in a very interesting 
+situation where a real-time threaded process is in the middle of a
+coredump when someone whacks it with a SIGKILL. However, this deadlock
+leaves the system pretty hosed and you have to reboot to recover.
+
+Not good for real-time priority-preemption applications like our
+telephony application, with 90+ real-time (SCHED_FIFO and SCHED_RR)
+processes, many of them multi-threaded, interacting with each other for
+high volume call processing.
+
+Acked-by: Roland McGrath <roland at redhat.com>
+Signed-off-by: Linus Torvalds <torvalds at osdl.org>
+Signed-off-by: Chris Wright <chrisw at osdl.org>
+---
+ kernel/signal.c |    2 +-
+ 1 files changed, 1 insertion(+), 1 deletion(-)
+ 
+Backported to Debian's 2.6.8 by Horms
+
 --- a/kernel/signal.c	2005-08-31 17:04:28.000000000 +0900
 +++ b/kernel/signal.c	2005-08-31 17:05:44.000000000 +0900
 @@ -631,6 +631,12 @@

Modified: branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17
===================================================================
--- branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17	2005-08-31 08:40:55 UTC (rev 4080)
+++ branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17	2005-08-31 08:51:17 UTC (rev 4081)
@@ -57,4 +57,4 @@
 + fix-dst-leak-in-icmp_push_reply.dpatch
 + nptl-signal-delivery-deadlock-fix.dpatch
 + zlib-revert-broken-change.dpatch
-+ genelink-usbnet-skb-typo.patch
++ genelink-usbnet-skb-typo.dpatch