Subject: linux-next: manual merge of the akpm-current tree with the file-locks tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 2 Nov 2015 02:43:13 +1100

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:

  fs/9p/vfs_file.c

between commit:

  4f6563677ae8 ("Move locks API users to locks_lock_inode_wait()")

from the file-locks tree and commit:

  4c3932157148 ("9p: do not overwrite return code when locking fails")

from the akpm-current tree.

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

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc fs/9p/vfs_file.c
index f23fd86697ea,6b747394f6f5..000000000000
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@@ -231,7 -231,8 +231,8 @@@ out_unlock
  	if (res < 0 && fl->fl_type != F_UNLCK) {
  		fl_type = fl->fl_type;
  		fl->fl_type = F_UNLCK;
- 		res = locks_lock_file_wait(filp, fl);
+ 		/* Even if this fails we want to return the remote error */
 -		posix_lock_file_wait(filp, fl);
++		locks_lock_file_wait(filp, fl);
  		fl->fl_type = fl_type;
  	}
  out: