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

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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

Attachment: pgp00000.pgp
Description: PGP signature