## Automatically generated incremental diff
## From:   linux-2.2.13-pre13
## To:     linux-2.2.13-pre14
## Robot:  $Id: make-incremental-diff,v 1.11 2002/02/20 02:59:33 hpa Exp $

diff -urN linux-2.2.13-pre13/drivers/block/ide.c linux-2.2.13-pre14/drivers/block/ide.c
--- linux-2.2.13-pre13/drivers/block/ide.c	1999-08-09 12:04:39.000000000 -0700
+++ linux-2.2.13-pre14/drivers/block/ide.c	2003-08-15 15:08:14.000000000 -0700
@@ -1541,8 +1541,11 @@
 	do_hwgroup_request(hwgroup);
 	save_flags(flags);	/* all CPUs; overkill? */
 	cli();			/* all CPUs; overkill? */
-	if (action == ide_wait && rq->rq_status != RQ_INACTIVE)
+	if (action == ide_wait)
+	{
 		down(&sem);	/* wait for it to be serviced */
+		rq->sem = NULL;
+	}
 	restore_flags(flags);	/* all CPUs; overkill? */
 	return rq->errors ? -EIO : 0;	/* return -EIO if errors */
 }
diff -urN linux-2.2.13-pre13/Makefile linux-2.2.13-pre14/Makefile
--- linux-2.2.13-pre13/Makefile	2003-08-15 15:08:14.000000000 -0700
+++ linux-2.2.13-pre14/Makefile	2003-08-15 15:08:14.000000000 -0700
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 2
 SUBLEVEL = 13
-EXTRAVERSION = pre13
+EXTRAVERSION = pre14
 
 ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
 
diff -urN linux-2.2.13-pre13/net/sched/sch_generic.c linux-2.2.13-pre14/net/sched/sch_generic.c
--- linux-2.2.13-pre13/net/sched/sch_generic.c	1999-03-21 07:22:00.000000000 -0800
+++ linux-2.2.13-pre14/net/sched/sch_generic.c	2003-08-15 15:08:15.000000000 -0700
@@ -419,6 +419,7 @@
 		for (hp = &qdisc_head.forw; (h = *hp) != &qdisc_head; hp = &h->forw) {
 			if (h == &qdisc->h) {
 				*hp = h->forw;
+				h->forw = NULL;
 				break;
 			}
 		}
