linux-next: manual merge of the akpm-current tree with the vfs tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1538 bytes --]

Hi all,

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

  fs/proc/base.c

between commit:

  0168b9e38c42 ("procfs: switch instantiate_t to d_splice_alias()")

from the vfs tree and commit:

  a1cb629945be ("proc: skip branch in /proc/*/* lookup")

from the akpm-current 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 fs/proc/base.c
index af128b374143,9b02b88e0b91..000000000000
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@@ -2479,17 -2457,14 +2451,14 @@@ static struct dentry *proc_pident_looku
  	for (p = ents; p < last; p++) {
  		if (p->len != dentry->d_name.len)
  			continue;
- 		if (!memcmp(dentry->d_name.name, p->name, p->len))
+ 		if (!memcmp(dentry->d_name.name, p->name, p->len)) {
 -			error = proc_pident_instantiate(dir, dentry, task, p);
++			res = proc_pident_instantiate(dentry, task, p);
  			break;
+ 		}
  	}
- 	if (p >= last)
- 		goto out;
- 
- 	res = proc_pident_instantiate(dentry, task, p);
- out:
  	put_task_struct(task);
  out_no_task:
 -	return ERR_PTR(error);
 +	return res;
  }
  
  static int proc_pident_readdir(struct file *file, struct dir_context *ctx,

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]