Subject: linux-next: manual merge of the vfs tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Sun, 22 Feb 2015 11:46:51 +1100

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
drivers/infiniband/hw/qib/qib_fs.c between commit 041af0bb765a
("IB/qib: Fix sizeof checkpatch warnings") from Linus' tree and commit
271b063723fd ("VFS: (Scripted) Convert ->d_inode to fs_inode() in
drivers/infiniband/hw/qib/qib_fs.c") from the vfs tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/infiniband/hw/qib/qib_fs.c
index 55f240a363fe,88cc9a288ccd..000000000000
--- a/drivers/infiniband/hw/qib/qib_fs.c
+++ b/drivers/infiniband/hw/qib/qib_fs.c
@@@ -481,8 -481,8 +481,8 @@@ static int remove_device_files(struct s
  	int ret, i;
  
  	root = dget(sb->s_root);
- 	mutex_lock(&root->d_inode->i_mutex);
+ 	mutex_lock(&fs_inode(root)->i_mutex);
 -	snprintf(unit, sizeof unit, "%u", dd->unit);
 +	snprintf(unit, sizeof(unit), "%u", dd->unit);
  	dir = lookup_one_len(unit, root, strlen(unit));
  
  	if (IS_ERR(dir)) {