linux-kernel - linux-next: manual merge of the akpm 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]

Date:	Mon, 25 Feb 2013 14:40:01 +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,
	Sasha Levin <sasha.levin@...cle.com>,
	Al Viro <viro@...iv.linux.org.uk>
Subject: linux-next: manual merge of the akpm tree with the vfs tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
fs/sysfs/bin.c between commit 496ad9aa8ef4 ("new helper: file_inode
(file)") from the vfs tree and commit "hlist: drop the node parameter
from iterators" from the akpm 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/sysfs/bin.c
index 2ce9a5d,f186e27..0000000
--- a/fs/sysfs/bin.c
+++ b/fs/sysfs/bin.c
@@@ -468,8 -467,8 +467,8 @@@ void unmap_bin_file(struct sysfs_diren
  
  	mutex_lock(&sysfs_bin_lock);
  
- 	hlist_for_each_entry(bb, tmp, &attr_sd->s_bin_attr.buffers, list) {
+ 	hlist_for_each_entry(bb, &attr_sd->s_bin_attr.buffers, list) {
 -		struct inode *inode = bb->file->f_path.dentry->d_inode;
 +		struct inode *inode = file_inode(bb->file);
  
  		unmap_mapping_range(inode->i_mapping, 0, 0, 1);
  	}

Content of type "application/pgp-signature" skipped