Merge branch 'maint' into next

Conflicts:

	configure
	lib/ext2fs/ext2_fs.h
	misc/e2image.c

diff --cc Makefile.in
Simple merge

diff --cc configure
index 4266a8d,baac0b0..cea632c
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -15796,8 -16036,8 +16008,8 @@@ PROFILED_LIB_EXT!$PROFILED_LIB_EXT$ac_d
  DEBUGFS_CMT!$DEBUGFS_CMT$ac_delim
  IMAGER_CMT!$IMAGER_CMT$ac_delim
  RESIZER_CMT!$RESIZER_CMT$ac_delim
- E2FSCK_TYPE!$E2FSCK_TYPE$ac_delim
  FSCK_PROG!$FSCK_PROG$ac_delim
++FSCK_MAN!$FSCK_MAN$ac_delim
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
@@@ -15867,9 -16107,10 +16079,9 @@@ _ACEO
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
--FSCK_MAN!$FSCK_MAN$ac_delim
  E2INITRD_PROG!$E2INITRD_PROG$ac_delim
  E2INITRD_MAN!$E2INITRD_MAN$ac_delim
+ PKG_CONFIG!$PKG_CONFIG$ac_delim
  DEVMAPPER_REQ!$DEVMAPPER_REQ$ac_delim
  DEVMAPPER_PC_LIBS!$DEVMAPPER_PC_LIBS$ac_delim
  DEVMAPPER_LIBS!$DEVMAPPER_LIBS$ac_delim
@@@ -15950,7 -16192,7 +16163,7 @@@ LIBOBJS!$LIBOBJS$ac_deli
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; then
 -  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

diff --cc configure.in
Simple merge

diff --cc debian/rules
index 0f51818,6e74c2f..c24d769
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -112,10 -111,11 +111,10 @@@ STATIC_CONF_FLAGS = --with-ccopts="${CC
        --disable-nls --disable-imager \
        --disable-uuidd --disable-tls \
        --disable-e2initrd-helper \
-       --with-diet-libc --with-ccopts=-fno-stack-protector
+       --with-ccopts=-fno-stack-protector
  
  MIPS_NOPIC_CONF_FLAGS = --with-ccopts="${CCOPTS}" \
 -      --disable-nls \
 -      --disable-swapfs --disable-imager \
 +      --disable-nls --disable-imager \
        --disable-uuidd --disable-tls \
          --disable-resizer # --disable-debugfs
  

diff --cc doc/libext2fs.texinfo
Simple merge

diff --cc e2fsck/Makefile.in
Simple merge

diff --cc e2fsck/super.c
Simple merge

diff --cc lib/blkid/probe.c
Simple merge

diff --cc lib/ext2fs/ext2_fs.h
index e04ba9a,dd5e495..896c590
--- 1/lib/ext2fs/ext2_fs.h
--- 2/lib/ext2fs/ext2_fs.h
+++ b/lib/ext2fs/ext2_fs.h
@@@ -429,8 -440,27 +429,10 @@@ struct ext2_inode_large 
  #endif  /* __GNU__ */
  #endif        /* defined(__KERNEL__) || defined(__linux__) */
  
 -#if defined(__masix__)
 -#define inode_uid(inode)      ((inode).i_uid)
 -#define inode_gid(inode)      ((inode).i_gid)
 -#define ext2fs_set_i_uid_high(inode,x) (x)
 -#define ext2fs_set_i_gid_high(inode,x) (x)
 -
 -#else
  #define inode_uid(inode)      ((inode).i_uid | (inode).osd2.linux2.l_i_uid_high << 16)
  #define inode_gid(inode)      ((inode).i_gid | (inode).osd2.linux2.l_i_gid_high << 16)
 -#endif
+ #define ext2fs_set_i_uid_high(inode,x) ((inode).osd2.linux2.l_i_uid_high = (x))
+ #define ext2fs_set_i_gid_high(inode,x) ((inode).osd2.linux2.l_i_gid_high = (x))
  
  /*
   * File system states

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

diff --cc misc/e2image.c
Simple merge

diff --cc misc/mke2fs.c
index b0cbc42,ede6722..e6cd1ac
--- 1/misc/mke2fs.c
--- 2/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@@ -870,11 -873,11 +873,12 @@@ static __u32 ok_features[3] = 
        EXT3_FEATURE_COMPAT_HAS_JOURNAL |
                EXT2_FEATURE_COMPAT_RESIZE_INODE |
                EXT2_FEATURE_COMPAT_DIR_INDEX |
-               EXT2_FEATURE_COMPAT_LAZY_BG,    /* Compat */
+               EXT2_FEATURE_COMPAT_LAZY_BG |
+               EXT2_FEATURE_COMPAT_EXT_ATTR,   /* Compat */
        EXT2_FEATURE_INCOMPAT_FILETYPE|         /* Incompat */
                EXT3_FEATURE_INCOMPAT_JOURNAL_DEV|
 -              EXT2_FEATURE_INCOMPAT_META_BG,
 +              EXT2_FEATURE_INCOMPAT_META_BG|
 +              EXT4_FEATURE_INCOMPAT_FLEX_BG,
        EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER     /* R/O compat */
  };
  

diff --cc misc/tune2fs.c
Simple merge