Merge branch 'maint' into next

Conflicts:

	configure
	debian/rules
	e2fsck/swapfs.c
	lib/ext2fs/ext2_fs.h

diff --cc configure
index 4e7a3b66614fc9c032e72aad49942099caf913af,8ecc41afe47ccf794aa128ce0c4389a77f15c67c..4266a8d7b06c56a70250f98e25963e09ea929a66
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -15899,7 -15979,7 +15950,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` = 80; then
 -  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; 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 b49b0ca6ac320eeb13de2f4328c213163b87a6df,11db3450926152e1081a8220e096068efa21aea7..0f518188ea2f58cb75f203f0382f3aea2d3ba3d0
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -97,11 -104,21 +104,20 @@@ STD_CONF_FLAGS = --with-ccopts="${CCOPT
                ${DEVMAPPER}
  
  BF_CONF_FLAGS = --with-ccopts="${CCOPTS} ${BF_CCOPTS}" \
 -      --disable-nls --disable-swapfs --disable-imager \
 +      --disable-nls --disable-imager \
+       --disable-uuidd --disable-tls \
        --disable-debugfs  --disable-e2initrd-helper
  
+ STATIC_CONF_FLAGS = --with-ccopts="${CCOPTS}" \
+       --disable-nls --disable-imager \
+       --disable-uuidd --disable-tls \
+       --disable-e2initrd-helper \
+       --with-diet-libc --with-ccopts=-fno-stack-protector
+ 
  MIPS_NOPIC_CONF_FLAGS = --with-ccopts="${CCOPTS}" \
-       --disable-nls --disable-imager --disable-resizer # --disable-debugfs
 -      --disable-nls \
 -      --disable-swapfs --disable-imager \
++      --disable-nls --disable-imager \
+       --disable-uuidd --disable-tls \
+         --disable-resizer # --disable-debugfs
  
  # we can't use those flags at configure time
  MIPS_CFLAGS= -G 0 -fno-pic -mno-abicalls

diff --cc debugfs/debugfs.c
Simple merge

diff --cc debugfs/set_fields.c
Simple merge

diff --cc doc/libext2fs.texinfo
Simple merge

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

diff --cc e2fsck/rehash.c
Simple merge

diff --cc lib/ext2fs/ext2_fs.h
index a11e6be536949b52a2c01b933f6af1e49ebb4a47,7e58219929fd0dbd765de21a95e0dcad2ac9e436..e04ba9a154cb6f5e80fe2c669b0f20bd203bae55
--- 1/lib/ext2fs/ext2_fs.h
--- 2/lib/ext2fs/ext2_fs.h
+++ b/lib/ext2fs/ext2_fs.h
@@@ -423,12 -436,27 +425,13 @@@ struct ext2_inode_large 
  #define i_uid_high    osd2.hurd2.h_i_uid_high
  #define i_gid_high    osd2.hurd2.h_i_gid_high
  #define i_author      osd2.hurd2.h_i_author
- #define inode_uid(inode)      ((inode).i_uid | (inode).i_uid_high << 16)
- #define inode_gid(inode)      ((inode).i_gid | (inode).i_gid_high << 16)
  
 -#else
 -#if defined(__masix__)
 -
 -#define i_reserved1   osd1.masix1.m_i_reserved1
 -#define i_frag                osd2.masix2.m_i_frag
 -#define i_fsize               osd2.masix2.m_i_fsize
 -#define i_reserved2   osd2.masix2.m_i_reserved2
 -
 -#endif  /* __masix__ */
  #endif  /* __GNU__ */
  #endif        /* defined(__KERNEL__) || defined(__linux__) */
  
 -#if defined(__masix__)
 -#define inode_uid(inode)      ((inode).i_uid)
 -#define inode_gid(inode)      ((inode).i_gid)
 -#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
+ 
  /*
   * File system states
   */

diff --cc lib/ext2fs/ext2fs.h
Simple merge

diff --cc misc/Makefile.in
Simple merge

diff --cc misc/e2image.c
Simple merge

diff --cc resize/resize2fs.c
Simple merge