From: Theodore Ts'o <tytso@mit.edu>
Date: Sat, 26 Jul 2014 13:45:19 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.43-WIP-2015-05-18~268^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50972e1f7dd33955d1f23de8123dae235a65af44;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint' into next

Conflicts:
	debugfs/debugfs.c
	e2fsck/pass5.c
---

50972e1f7dd33955d1f23de8123dae235a65af44
diff --cc debugfs/debugfs.c
index 5ab43a3e5,b6ba1da46..641e8bc31
--- a/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@@ -2093,8 -2347,6 +2093,7 @@@ void do_symlink(int argc, char *argv[]
  
  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;
  	errcode_t retval = 0;