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

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
fs/proc/inode.c between commit d3d009cb965e ("saner proc_get_inode()
calling conventions") from the vfs tree and commit "fs/proc: clean up
printks" from the akpm-current tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc fs/proc/inode.c
index 70322e1,b4625dd..0000000
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@@ -495,7 -499,8 +496,7 @@@ int proc_fill_super(struct super_block 
  	pde_get(&proc_root);
  	root_inode = proc_get_inode(s, &proc_root);
  	if (!root_inode) {
- 		printk(KERN_ERR "proc_fill_super: get root inode failed\n");
+ 		pr_warn("proc_fill_super: get root inode failed\n");
 -		pde_put(&proc_root);
  		return -ENOMEM;
  	}

Attachment: pgp00000.pgp
Description: PGP signature