Merge remote-tracking branch 'xfs/for-next'

diff --cc fs/xfs/xfs_acl.c
Simple merge

diff --cc fs/xfs/xfs_bmap_util.c
Simple merge

diff --cc fs/xfs/xfs_buf.c
Simple merge

diff --cc fs/xfs/xfs_file.c
Simple merge

diff --cc fs/xfs/xfs_inode.c
Simple merge

diff --cc fs/xfs/xfs_inode.h
index e0ae905554e25519dad1be21556ef6537d469c13,768f0d743158fdeb0fd53ef0bea163ca50d0ef25..b21b177832d16277df83f98c78124a34889adfed
--- 1/fs/xfs/xfs_inode.h
--- 2/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@@ -40,7 -40,9 +40,8 @@@ typedef struct xfs_inode 
        /* Transaction and locking information. */
        struct xfs_inode_log_item *i_itemp;     /* logging information */
        mrlock_t                i_lock;         /* inode lock */
 -      mrlock_t                i_mmaplock;     /* inode mmap IO lock */
        atomic_t                i_pincount;     /* inode pin count */
+       struct llist_node       i_gclist;       /* deferred inactivation list */
  
        /*
         * Bitsets of inode metadata that have been checked and/or are sick.

diff --cc fs/xfs/xfs_super.c
Simple merge

diff --cc include/linux/cpuhotplug.h
Simple merge