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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 3 Nov 2014 13:29:14 +1100

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/lustre/lustre/llite/file.c between commit bc281d072ba9
("lustre: opened file can't have negative dentry") from the vfs tree
and commit 57303e76c225 ("staging: lustre: Fix checkpatch.pl
spacing-related errors") from the staging 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/staging/lustre/lustre/llite/file.c
index a2ae9a68a9a0,a5acc98a1c99..000000000000
--- a/drivers/staging/lustre/lustre/llite/file.c
+++ b/drivers/staging/lustre/lustre/llite/file.c
@@@ -266,10 -266,6 +266,11 @@@ static int ll_md_close(struct obd_expor
  {
  	struct ll_file_data *fd = LUSTRE_FPRIVATE(file);
  	struct ll_inode_info *lli = ll_i2info(inode);
 +	int lockmode;
 +	__u64 flags = LDLM_FL_BLOCK_GRANTED | LDLM_FL_TEST_LOCK;
 +	struct lustre_handle lockh;
- 	ldlm_policy_data_t policy = {.l_inodebits={MDS_INODELOCK_OPEN}};
++	ldlm_policy_data_t policy = {
++	.l_inodebits = {MDS_INODELOCK_OPEN} };
  	int rc = 0;
  
  	/* clear group lock, if present */