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

diff -urN linux-2.4.21-bk32/MAINTAINERS linux-2.4.21-bk33/MAINTAINERS
--- linux-2.4.21-bk32/MAINTAINERS	2003-08-14 02:54:35.000000000 -0700
+++ linux-2.4.21-bk33/MAINTAINERS	2003-08-14 02:54:41.000000000 -0700
@@ -760,8 +760,8 @@
 S:	Maintained
 
 HFS FILESYSTEM
-P:      Oliver Neukum
-M:      oliver@neukum.org
+P:		Roman Zippel
+P:		zippel@linux-m68k.org
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
diff -urN linux-2.4.21-bk32/Makefile linux-2.4.21-bk33/Makefile
--- linux-2.4.21-bk32/Makefile	2003-08-14 02:54:35.000000000 -0700
+++ linux-2.4.21-bk33/Makefile	2003-08-14 02:54:41.000000000 -0700
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 21
-EXTRAVERSION = -bk32
+EXTRAVERSION = -bk33
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
diff -urN linux-2.4.21-bk32/drivers/net/pppoe.c linux-2.4.21-bk33/drivers/net/pppoe.c
--- linux-2.4.21-bk32/drivers/net/pppoe.c	2002-08-02 17:39:44.000000000 -0700
+++ linux-2.4.21-bk33/drivers/net/pppoe.c	2003-08-14 02:54:42.000000000 -0700
@@ -605,7 +605,8 @@
 		/* Delete the old binding */
 		delete_item(po->pppoe_pa.sid,po->pppoe_pa.remote);
 
-		dev_put(po->pppoe_dev);
+		if(po->pppoe_dev)
+			dev_put(po->pppoe_dev);
 
 		memset(po, 0, sizeof(struct pppox_opt));
 		po->sk = sk;
diff -urN linux-2.4.21-bk32/include/asm-x86_64/desc.h linux-2.4.21-bk33/include/asm-x86_64/desc.h
--- linux-2.4.21-bk32/include/asm-x86_64/desc.h	2002-11-28 15:53:15.000000000 -0800
+++ linux-2.4.21-bk33/include/asm-x86_64/desc.h	2003-08-14 02:54:45.000000000 -0700
@@ -99,12 +99,12 @@
 
 static inline void set_intr_gate(int nr, void *func) 
 { 
-	_set_gate(&idt_table[nr], GATE_INTERRUPT, (unsigned long) func, 3, 0); 
+	_set_gate(&idt_table[nr], GATE_INTERRUPT, (unsigned long) func, 0, 0); 
 } 
 
 static inline void set_intr_gate_ist(int nr, void *func, unsigned ist) 
 { 
-	_set_gate(&idt_table[nr], GATE_INTERRUPT, (unsigned long) func, 3, ist); 
+	_set_gate(&idt_table[nr], GATE_INTERRUPT, (unsigned long) func, 0, ist); 
 } 
 
 static inline void set_system_gate(int nr, void *func) 
diff -urN linux-2.4.21-bk32/kernel/ptrace.c linux-2.4.21-bk33/kernel/ptrace.c
--- linux-2.4.21-bk32/kernel/ptrace.c	2003-06-13 07:51:39.000000000 -0700
+++ linux-2.4.21-bk33/kernel/ptrace.c	2003-08-14 02:54:45.000000000 -0700
@@ -166,6 +166,7 @@
 			memcpy(maddr + offset, buf, bytes);
 			flush_page_to_ram(page);
 			flush_icache_user_range(vma, page, addr, len);
+			set_page_dirty(page);
 		} else {
 			memcpy(buf, maddr + offset, bytes);
 			flush_page_to_ram(page);
diff -urN linux-2.4.21-bk32/net/sunrpc/xdr.c linux-2.4.21-bk33/net/sunrpc/xdr.c
--- linux-2.4.21-bk32/net/sunrpc/xdr.c	2003-08-14 02:54:39.000000000 -0700
+++ linux-2.4.21-bk33/net/sunrpc/xdr.c	2003-08-14 02:54:46.000000000 -0700
@@ -231,7 +231,6 @@
 		iov->iov_base = (char *)xdr->tail[0].iov_base + base;
 		iov++;
 	}
- out:
 	return (iov - iov_base);
 out_err:
 	for (; first_kmap != ppage; first_kmap++)
