Merge branch 'maint' into next

Conflicts:
	RELEASE-NOTES
	lib/ext2fs/ext2_err.et.in
	version.h

diff --cc RELEASE-NOTES
index b98eb7a,eaf7962..c9dd876
--- 1/RELEASE-NOTES
--- 2/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@@ -1,25 -1,5 +1,25 @@@
- E2fsprogs 1.42.7 (January 1, 2013)
- ==================================
 +E2fsprogs 1.43-WIP (September 22, 2012)
 +=======================================
 +
 +Add support for the ext4 metadata checksum feature.
 +
 +Check to make sure file system features which can not be supported by
 +HURD are not enabled if the file system is created to be
 +HURD-compatible.
 +
 +
 +Programmer's Notes
 +------------------
 +
 +Reduce the use of libc functions in libext2fs that may not be present
 +in the boot loader environment, at least for those functions that are
 +needed by boot loadsers such as yaboot.
 +
 +Support for the MMP feature can now be disabled at compile time.
 +
 +
+ E2fsprogs 1.42.7 (January 15, 2013)
+ ===================================
  
  Add some new options to filefrag from Lustre's patches to e2fsprogs:
      * add -k option to print extents in kB-sized units (like df -k)

diff --cc debian/changelog
index 81ca5b7,8330895..d36496e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -21,17 -36,20 +36,26 @@@ e2fsprogs (1.42.7-1) unstable; urgency=
      through the pager.
    * Fixed debugfs's dump_file and cat functions so they work correctly
      on file systems with a block size greater than 8k.
+   * Fixed mke2fs's handling of the mmp_update_interval option
    * Fixed e2freefrag so it works on 64-bit file systems, and so it uses
      much less memory.
+   * E2image can now include all data blocks in the e2image output
+     file when the user specifies the -a option.
+   * Fixed debugfs's mknod command so that it updates the block group
+     statistics
+   * Document the bigalloc feature in the mke2fs man page.
+     (Closes: #669730)
+   * Update Czech, Dutch, French, German, Polish, Sweedish, and
+     Vietnamese translations
  
-  -- Theodore Y. Ts'o <tytso@mit.edu>  Tue, 1 Jan 2013 10:23:04 -0500
+  -- Theodore Y. Ts'o <tytso@mit.edu>  Tue, 15 Jan 2013 22:31:25 -0500
  
 +e2fsprogs (1.43~WIP-2012-09-22-1) unstable; urgency=low
 +
 +  * Add metadata checksum feature
 +
 + -- Theodore Y. Ts'o <tytso@mit.edu>  Sat, 22 Sep 2012 21:50:20 -0400
 +
  e2fsprogs (1.42.6-1) unstable; urgency=low
  
    * New upstream version

diff --cc debian/e2fslibs.symbols
Simple merge

diff --cc debugfs/debugfs.8.in
Simple merge

diff --cc debugfs/debugfs.c
index 341edfa,2a1525a..969dbe0
--- 1/debugfs/debugfs.c
--- 2/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@@ -2202,9 -2189,51 +2201,52 @@@ void do_punch(int argc, char *argv[]
  }
  #endif /* READ_ONLY */
  
+ void do_symlink(int argc, char *argv[])
+ {
+       char            *cp;
+       ext2_ino_t      parent;
+       char            *name, *target;
+       errcode_t       retval;
+ 
+       if (common_args_process(argc, argv, 3, 3, "symlink",
+                               "<filename> <target>", CHECK_FS_RW))
+               return;
+ 
+       cp = strrchr(argv[1], '/');
+       if (cp) {
+               *cp = 0;
+               parent = string_to_inode(argv[1]);
+               if (!parent) {
+                       com_err(argv[1], ENOENT, 0);
+                       return;
+               }
+               name = cp+1;
+       } else {
+               parent = cwd;
+               name = argv[1];
+       }
+       target = argv[2];
+ 
+ try_again:
+       retval = ext2fs_symlink(current_fs, parent, 0, name, target);
+       if (retval == EXT2_ET_DIR_NO_SPACE) {
+               retval = ext2fs_expand_dir(current_fs, parent);
+               if (retval) {
+                       com_err(argv[0], retval, "while expanding directory");
+                       return;
+               }
+               goto try_again;
+       }
+       if (retval) {
+               com_err("ext2fs_symlink", retval, 0);
+               return;
+       }
+ 
+ }
+ 
  void do_dump_mmp(int argc EXT2FS_ATTR((unused)), char *argv[])
  {
 +#if CONFIG_MMP
        struct ext2_super_block *sb;
        struct mmp_struct *mmp_s;
        time_t t;
@@@ -2248,14 -2277,9 +2290,14 @@@
        fprintf(stdout, "node_name: %s\n", mmp_s->mmp_nodename);
        fprintf(stdout, "device_name: %s\n", mmp_s->mmp_bdevname);
        fprintf(stdout, "magic: 0x%x\n", mmp_s->mmp_magic);
 +      fprintf(stdout, "checksum: 0x%08x\n", mmp_s->mmp_checksum);
 +#else
 +      fprintf(stdout, "MMP is unsupported, please recompile with "
 +                      "--enable-mmp\n");
 +#endif
  }
  
- static int source_file(const char *cmd_file, int sci_idx)
+ static int source_file(const char *cmd_file, int ss_idx)
  {
        FILE            *f;
        char            buf[256];

diff --cc lib/ext2fs/Makefile.in
Simple merge

diff --cc lib/ext2fs/initialize.c
Simple merge

diff --cc misc/mke2fs.c
Simple merge

diff --cc version.h
index 3f95951,58329f6..fd3ee9d
--- 1/version.h
--- 2/version.h
+++ b/version.h
@@@ -7,5 -7,5 +7,5 @@@
   * file may be redistributed under the GNU Public License v2.
   */
  
 -#define E2FSPROGS_VERSION "1.42.7"
 +#define E2FSPROGS_VERSION "1.43-WIP"
- #define E2FSPROGS_DATE "1-Dec-2013"
+ #define E2FSPROGS_DATE "15-Jan-2013"