[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-next
Subject:    linux-next: manual merge of the target-bva tree with Linus' tree
From:       Stephen Rothwell <sfr () canb ! auug ! org ! au>
Date:       2016-12-19 1:28:50
Message-ID: 20161219122850.246a698e () canb ! auug ! org ! au
[Download RAW message or body]

Hi Bart,

Today's linux-next merge of the target-bva tree got a conflict in:

  drivers/target/target_core_configfs.c

between commit:

  450630975da9 ("don't open-code file_inode()")

from Linus' tree and commit:

  8cc3bb0789ea ("target: Use NULL instead of 0 to represent a pointer")

from the target-bva tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/target/target_core_configfs.c
index a35a347ec357,3bf6384c0f96..000000000000
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@@ -143,8 -143,8 +143,8 @@@ static ssize_t target_core_item_dbroot_
  		pr_err("db_root: cannot open: %s\n", db_root_stage);
  		return -EINVAL;
  	}
 -	if (!S_ISDIR(fp->f_inode->i_mode)) {
 +	if (!S_ISDIR(file_inode(fp)->i_mode)) {
- 		filp_close(fp, 0);
+ 		filp_close(fp, NULL);
  		mutex_unlock(&g_tf_lock);
  		pr_err("db_root: not a directory: %s\n", db_root_stage);
  		return -EINVAL;
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]