Orangefs: Merge tag 'v4.4-rc1' into for-next

Linux 4.4-rc1

diff --combined fs/Makefile
index b4406d6f7da15a492f73fb81667720b4a4f3849b,79f522575cba3e79e6909ca4c1c055d2cb54ce9a..f0f2f00951f505db759590419b1b04a091ee8874
--- 1/fs/Makefile
--- 2/fs/Makefile
+++ b/fs/Makefile
@@@ -63,10 -63,11 +63,11 @@@ obj-$(CONFIG_DLM)          += dlm
  # Do not add any filesystems before this line
  obj-$(CONFIG_FSCACHE)         += fscache/
  obj-$(CONFIG_REISERFS_FS)     += reiserfs/
- obj-$(CONFIG_EXT2_FS)         += ext2/
- # We place ext4 after ext2 so plain ext2 root fs's are mounted using ext2
- # unless explicitly requested by rootfstype
  obj-$(CONFIG_EXT4_FS)         += ext4/
+ # We place ext4 before ext2 so that clean ext3 root fs's do NOT mount using the
+ # ext2 driver, which doesn't know about journalling!  Explicitly request ext2
+ # by giving the rootfstype= parameter.
+ obj-$(CONFIG_EXT2_FS)         += ext2/
  obj-$(CONFIG_JBD2)            += jbd2/
  obj-$(CONFIG_CRAMFS)          += cramfs/
  obj-$(CONFIG_SQUASHFS)                += squashfs/
@@@ -104,7 -105,6 +105,7 @@@ obj-$(CONFIG_AUTOFS4_FS)   += autofs4
  obj-$(CONFIG_ADFS_FS)         += adfs/
  obj-$(CONFIG_FUSE_FS)         += fuse/
  obj-$(CONFIG_OVERLAY_FS)      += overlayfs/
 +obj-$(CONFIG_ORANGEFS_FS)       += orangefs/
  obj-$(CONFIG_UDF_FS)          += udf/
  obj-$(CONFIG_SUN_OPENPROMFS)  += openpromfs/
  obj-$(CONFIG_OMFS_FS)         += omfs/