Merge branch 'master' into elflinkelflink

Resolved Conflicts:
	NEWS
	core/fs/fs.c
	version

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

4 files changed, 37 insertions, 11 deletions

diff --git a/NEWS b/NEWS
index a1c56177..b513c88b 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,14 @@ Changes in 5.00:
 	  COMBOOT files (.cbt and .com) are no longer supported under
 	  Syslinux.
 
+Changes in 4.07:
+	* EXTLINUX: fix crash caused by dereferencing garbage pointer.
+	* Plug memory leak in searchdir which eventually leads to an
+	  observable hang (Shao Miller).
+	* ISOLINUX: fix bug triggered by isohybrid images larger than
+	  32K which results in an invalid image checksum error.
+	* menugen: make it Py3k compatible (Paulo Alcantara).
+
 Changes in 4.06:
 	* Support for NTFS, by Paulo Alcantara.
 	* EXTLINUX: more robust device detection, allow user to override.
diff --git a/diag/geodsp/Makefile b/diag/geodsp/Makefile
index 91225b18..67637f91 100644
--- a/diag/geodsp/Makefile
+++ b/diag/geodsp/Makefile
@@ -34,14 +34,14 @@ all: $(BTARGET)
 
 # Higher compression levels result in larger files
 %.img.xz: %.bin mk-lba-img.pl
-	$(PERL) mk-lba-img $< | $(XZ) -0 > $@ || ( rm -f $@ ; false )
+	$(PERL) mk-lba-img.pl $< | $(XZ) -0 > $@ || ( rm -f $@ ; false )
 
 %.img.gz: %.bin mk-lba-img.pl
-	$(PERL) mk-lba-img $< | $(GZIPPROG) -9 > $@ || ( rm -f $@ ; false )
+	$(PERL) mk-lba-img.pl $< | $(GZIPPROG) -9 > $@ || ( rm -f $@ ; false )
 
 # in case someone really wants these without needing a decompressor
 %.img: %.bin mk-lba-img.pl
-	$(PERL) mk-lba-img $< > $@ || ( rm -f $@ ; false )
+	$(PERL) mk-lba-img.pl $< > $@ || ( rm -f $@ ; false )
 
 %.bin: %.asm $(coredir)/writehex.inc $(coredir)/macros.inc $(coredir)/diskboot.inc
 	$(NASM) $(NASMOPT) -o $@ -l $(@:.bin=.lst) $<
diff --git a/diag/geodsp/README b/diag/geodsp/README
index 55e08438..9129b694 100644
--- a/diag/geodsp/README
+++ b/diag/geodsp/README
@@ -1,11 +1,29 @@
-GeoDsp: Images to display the geometry as the BIOS has choosen to interpret it.  Both images are intended to be written to the first ~8MiB of a raw device (ie /dev/hda, /dev/sda) and be over one large cylinder of 255*63 512-byte sectors in size.
+GeoDsp: Images to display the geometry as the BIOS has choosen to
+interpret it.  Both images are intended to be written to the first ~8MiB
+of a raw device (ie /dev/hda, /dev/sda) and be over one large cylinder
+of 255*63 512-byte sectors in size.
 
-GeoDsp1S is a one-sector variant containing all code in one sector that is intended to test behavior with a typical MBR/partition table layout.  A partition table should be written after writting an image.
+To save the existing data for restore later:
 
-GeoDspMS is a multi sector variant intended to look like Syslinux installed on a file system on the raw device (as opposed to a file system within a partition).
+	dd bs=1M iflag=fullblock count=8 if=/dev/sda of=sda.img
 
-GeoDspMS can also be used to attempt to make the boot sector look like a normal file system's boot sector (ie FAT12/FAT16/FAT32).  In order to do this, you must first save a portion the existing boot sector (the majority of the BIOS parameter block).
-	dd bs=1 skip=3 count=87 if=/dev/sda of=sda.bpb
-	dd conv=notrunc if=geodspms.img of=/dev/sda
-	dd conv=notrunc bs=1 seek=3 count=87 if=sda.bpb of=/dev/sda
+GeoDsp1S is a one-sector variant containing all code in one sector that
+is intended to test behavior with a typical MBR/partition table layout. 
+A partition table should be written after writting an image.
 
+GeoDspMS is a multi sector variant intended to look like Syslinux
+installed on a file system on the raw device (as opposed to a file
+system within a partition).
+
+GeoDspMS can also be used to attempt to make the boot sector look like a
+normal file system's boot sector (ie FAT12/FAT16/FAT32).  In order to do
+this, you must first save a portion the existing boot sector (the
+majority of the BIOS parameter block).
+
+	dd bs=1 skip=3 count=87 if=/dev/sda1 of=sda1.bpb
+	dd conv=notrunc if=geodspms.img of=/dev/sda1
+	dd conv=notrunc bs=1 seek=3 count=87 if=sda1.bpb of=/dev/sda1
+
+	dd bs=1 skip=3 count=87 if=/dev/fd0 of=fd0.bpb
+	dd conv=notrunc if=geodspms.img of=/dev/fd0
+	dd conv=notrunc bs=1 seek=3 count=87 if=fd0.bpb of=/dev/fd0
diff --git a/mbr/gptmbr.S b/mbr/gptmbr.S
index 7f450d30..c1db4e87 100644
--- a/mbr/gptmbr.S
+++ b/mbr/gptmbr.S
@@ -213,7 +213,7 @@ found_part:
 
 	movzwl	%cx,%eax		/* Length of GPT entry */
 	stosl
-	
+
 	rep; movsb			/* GPT entry follows MBR entry */
 	popw	%si