Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1544267

linux-next: manual merge of the target-bva tree with Linus' tree

Show all headers | View raw

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;

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the target-bva tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-12-19 02:30 +0100

csiph-web