Linus, please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git for-linus
This will update the following files:
fs/jfs/jfs_filsys.h | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
through these ChangeSets:
Commit: 36b12fb709d229f277efbbe710031d5a429b2412
Author: Dave Kleikamp <[email protected]> Wed, 06 Dec 2006 17:48:32 -0600
JFS: Fix conflicting superblock flags
JFS_NOINTEGRITY and JFS_USRQUOTA are defined to be the same value.
Change JFS_NOINTEGRITY to 0x40 and re-order the flags in the header
file to avoid repeating this problem.
Signed-off-by: Dave Kleikamp <[email protected]>