Merge of xfs-cmds-2.4.18:slinx:111140a by nathans.

minor changes to xfstests as we transition to new EA/ACL interfaces.

tools/README.auto-qa

@@ -15,6 +15,8 @@ ______________________                                      ______________
 		so it can update itself)
 	- copy an appropriate .config file to
  		$HOME/qa/$HOSTNAME.config
+	- You'll need to maunally install the "quota" and "acl"
+	  userspace tools, rest will be installed automatically.
 	- You'll need a hacked version of 'su' in $HOME/qa that
                 lets your user su to root/root without a password
                 (if you want to run from cron, it mustn't require

tools/auto-qa

@@ -333,7 +333,7 @@ do
 
         *clean)
             # we need to configure or else we might fail to clean
-            for pkg in attr acl xfsprogs dmapi xfsdump xfstests
+            for pkg in attr xfsprogs dmapi xfsdump xfstests
 	    do
                 cd $WORKAREA/cmd/$pkg
                 _log "        *** clean $pkg tools"
@@ -386,7 +386,7 @@ do
                         || _fail "            !!! build modules failed"
                                     
             _log "        *** build and install tools"
-            for pkg in attr acl xfsprogs dmapi xfsdump xfstests 
+            for pkg in attr xfsprogs dmapi xfsdump xfstests 
             do
                 cd $WORKAREA/cmd/$pkg
 

tools/srcdiff

@@ -78,8 +78,6 @@ foreach (@difflist) {
 }
 straightdiff 'xfs_cred.h', 'cmd/xfsprogs/include', 'linux/fs/xfs/linux';
 straightdiff 'xfs_fs.h', 'cmd/xfsprogs/include', 'linux/include/linux';
-straightdiff 'attr_kern.h', 'cmd/attr/include', 'linux/fs/xfs/linux';
-straightdiff 'attributes.h', 'cmd/attr/include', 'linux/include/linux';
 straightdiff 'dmapi_kern.h', 'cmd/dmapi/include', 'linux/include/linux';
 straightdiff 'dmapi.h', 'cmd/dmapi/include', 'linux/include/linux';
 straightdiff 'arch.h', 'cmd/xfsprogs/include', 'linux/include/linux/xfs_support';