## Automatically generated incremental diff
## From:   linux-2.4.1-pre12
## To:     linux-2.4.1
## Robot:  $Id: make-incremental-diff,v 1.8 2001/12/04 06:05:04 hpa Exp $

diff -urN linux-2.4.1-pre12/Makefile linux/Makefile
--- linux-2.4.1-pre12/Makefile	Mon Dec  3 22:27:12 2001
+++ linux/Makefile	Mon Dec  3 22:27:20 2001
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 1
-EXTRAVERSION =-pre12
+EXTRAVERSION =
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
@@ -110,8 +110,7 @@
 export SVGA_MODE = -DSVGA_MODE=NORMAL_VGA
 
 #
-# if you want the RAM disk device, define this to be the
-# size in blocks.
+# if you want the RAM disk device, define this to be the size in blocks.
 # This is i386 specific.
 #
 
diff -urN linux-2.4.1-pre12/arch/i386/boot/bootsect.S linux/arch/i386/boot/bootsect.S
--- linux-2.4.1-pre12/arch/i386/boot/bootsect.S	Tue Jul 18 14:55:01 2000
+++ linux/arch/i386/boot/bootsect.S	Mon Dec  3 22:27:20 2001
@@ -25,10 +25,9 @@
  * loads pretty fast by getting whole tracks at a time whenever possible.
  */
 
-#include <linux/config.h>		/* for CONFIG_ROOT_RDONLY */
 #include <asm/boot.h>
 
-SETUPSECS	= 4			/* default nr of setup-sectors */
+SETUPSECTS	= 4			/* default nr of setup-sectors */
 BOOTSEG		= 0x07C0		/* original address of boot-sector */
 INITSEG		= DEF_INITSEG		/* we move boot here - out of the way */
 SETUPSEG	= DEF_SETUPSEG		/* setup starts here */
@@ -46,8 +45,8 @@
 #define RAMDISK 0
 #endif 
 
-#ifndef CONFIG_ROOT_RDONLY
-#define CONFIG_ROOT_RDONLY 1
+#ifndef ROOT_RDONLY
+#define ROOT_RDONLY 1
 #endif
 
 .code16
@@ -394,11 +393,11 @@
 msg1:		.byte 13, 10
 		.ascii "Loading"
 
-# XXX: This is a *very* snug fit.
+# XXX: This is a fairly snug fit.
 
 .org 497
-setup_sects:	.byte SETUPSECS
-root_flags:	.word CONFIG_ROOT_RDONLY
+setup_sects:	.byte SETUPSECTS
+root_flags:	.word ROOT_RDONLY
 syssize:	.word SYSSIZE
 swap_dev:	.word SWAP_DEV
 ram_size:	.word RAMDISK
diff -urN linux-2.4.1-pre12/arch/i386/defconfig linux/arch/i386/defconfig
--- linux-2.4.1-pre12/arch/i386/defconfig	Mon Dec  3 22:27:12 2001
+++ linux/arch/i386/defconfig	Mon Dec  3 22:27:20 2001
@@ -133,7 +133,6 @@
 # CONFIG_MD_RAID1 is not set
 # CONFIG_MD_RAID5 is not set
 # CONFIG_BLK_DEV_LVM is not set
-# CONFIG_LVM_PROC_FS is not set
 
 #
 # Networking options
diff -urN linux-2.4.1-pre12/arch/sh/kernel/traps.c linux/arch/sh/kernel/traps.c
--- linux-2.4.1-pre12/arch/sh/kernel/traps.c	Mon Dec  3 22:27:13 2001
+++ linux/arch/sh/kernel/traps.c	Mon Dec  3 22:27:21 2001
@@ -11,6 +11,7 @@
  * 'Traps.c' handles hardware traps and faults after we have saved some
  * state in 'entry.S'.
  */
+#include <linux/config.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff -urN linux-2.4.1-pre12/fs/exec.c linux/fs/exec.c
--- linux-2.4.1-pre12/fs/exec.c	Mon Dec  3 22:27:13 2001
+++ linux/fs/exec.c	Mon Dec  3 22:27:21 2001
@@ -937,18 +937,22 @@
 #else
 	corename[4] = '\0';
 #endif
-	file = filp_open(corename, O_CREAT | 2 | O_TRUNC | O_NOFOLLOW, 0600);
+	file = filp_open(corename, O_CREAT | 2 | O_NOFOLLOW, 0600);
 	if (IS_ERR(file))
 		goto fail;
 	inode = file->f_dentry->d_inode;
 	if (inode->i_nlink > 1)
 		goto close_fail;	/* multiple links - don't dump */
+	if (d_unhashed(file->f_dentry))
+		goto close_fail;
 
 	if (!S_ISREG(inode->i_mode))
 		goto close_fail;
 	if (!file->f_op)
 		goto close_fail;
 	if (!file->f_op->write)
+		goto close_fail;
+	if (do_truncate(file->f_dentry, 0) != 0)
 		goto close_fail;
 	if (!binfmt->core_dump(signr, regs, file))
 		goto close_fail;
diff -urN linux-2.4.1-pre12/include/linux/lvm.h linux/include/linux/lvm.h
--- linux-2.4.1-pre12/include/linux/lvm.h	Mon Dec  3 22:27:13 2001
+++ linux/include/linux/lvm.h	Mon Dec  3 22:27:21 2001
@@ -69,6 +69,7 @@
 
 #define	_LVM_KERNEL_H_VERSION	"LVM 0.9.1_beta2 (18/01/2001)"
 
+#include <linux/config.h>
 #include <linux/version.h>
 
 /*
diff -urN linux-2.4.1-pre12/net/ipv4/netfilter/ipt_MASQUERADE.c linux/net/ipv4/netfilter/ipt_MASQUERADE.c
--- linux-2.4.1-pre12/net/ipv4/netfilter/ipt_MASQUERADE.c	Mon Dec  3 22:27:13 2001
+++ linux/net/ipv4/netfilter/ipt_MASQUERADE.c	Mon Dec  3 22:27:21 2001
@@ -1,5 +1,6 @@
 /* Masquerade.  Simple mapping which alters range to a local IP address
    (depending on route). */
+#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/ip.h>
 #include <linux/timer.h>
