Merge branch 'xfs-misc-fixes-for-4.4-1' into for-next

diff --cc fs/xfs/libxfs/xfs_btree.c
Simple merge

diff --cc fs/xfs/xfs_buf.c
index 90815c22b22df0227701ce2e2b30feef41fef2bd,cac62e14d73a2e055f2d0782ee4c3aa33fe0814c..3243cdf97f33f2998de6d8207d1128093a0ec587
--- 1/fs/xfs/xfs_buf.c
--- 2/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@@ -354,10 -354,11 +354,11 @@@ retry
                         */
                        if (!(++retries % 100))
                                xfs_err(NULL,
-               "possible memory allocation deadlock in %s (mode:0x%x)",
+               "%s(%u) possible memory allocation deadlock in %s (mode:0x%x)",
+                                       current->comm, current->pid,
                                        __func__, gfp_mask);
  
 -                      XFS_STATS_INC(xb_page_retries);
 +                      XFS_STATS_INC(bp->b_target->bt_mount, xb_page_retries);
                        congestion_wait(BLK_RW_ASYNC, HZ/50);
                        goto retry;
                }

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