Merge branch 'master' of git://github.com/linux-sunxi/sunxi-tools

Conflicts:
	nand-part.c

nand-part.c

@@ -50,7 +50,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include <linux/fs.h>
+#include <sys/mount.h> /* BLKRRPART */
 #include "nand-part.h"
 
 #define MAX_NAME 16
@@ -254,6 +254,10 @@ int writembrs(int fd, char names[][MAX_NAME], __u32 *lens, unsigned int *user_ty
 		lseek(fd,MBR_START_ADDRESS + MBR_SIZE*i,SEEK_SET);
 		write(fd,mbr,MBR_SIZE);
 	}
+
+	if (ioctl(fd, BLKRRPART, NULL))
+		perror("Failed rereading partition table");
+
 	return 1;
 }