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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20130227130007.ffaca3220a5a5e87d9f50f2b@canb.auug.org.au>
Date:	Wed, 27 Feb 2013 13:00:07 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Al Viro <viro@...iv.linux.org.uk>
Subject: linux-next: manual merge of the akpm-current tree with the vfs tree

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@...b.auug.org.au

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;
  	}
  

Content of type "application/pgp-signature" skipped