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: <20150413210055.42eeecd5@canb.auug.org.au>
Date:	Mon, 13 Apr 2015 21:00:55 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>,
	Al Viro <viro@...IV.linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	David Howells <dhowells@...hat.com>,
	Fabian Frederick <fabf@...net.be>
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/befs/linuxvfs.c between commit 5dd3dc06371a ("VFS: normal
filesystems (and lustre): d_inode() annotations") from the vfs tree and
commit badfbaf2a80c ("befs: replace typedef befs_inode_info by
structure") 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/befs/linuxvfs.c
index d3cb8774765f,16e0a48bfccd..000000000000
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@@ -472,7 -471,7 +471,7 @@@ static void 
  befs_follow_link(struct dentry *dentry, struct nameidata *nd)
  {
  	struct super_block *sb = dentry->d_sb;
- 	befs_inode_info *befs_ino = BEFS_I(d_inode(dentry));
 -	struct befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
++	struct befs_inode_info *befs_ino = BEFS_I(d_inode(dentry));
  	befs_data_stream *data = &befs_ino->i_data.ds;
  	befs_off_t len = data->size;
  	char *link;
@@@ -502,7 -501,8 +501,8 @@@
  static void *
  befs_fast_follow_link(struct dentry *dentry, struct nameidata *nd)
  {
- 	befs_inode_info *befs_ino = BEFS_I(d_inode(dentry));
 -	struct befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
++	struct befs_inode_info *befs_ino = BEFS_I(d_inode(dentry));
+ 
  	nd_set_link(nd, befs_ino->i_data.symlink);
  	return NULL;
  }

Content of type "application/pgp-signature" skipped