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

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
	Al Viro <viro@ZenIV.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	David Howells <dhowells@redhat.com>,
	Fabian Frederick <fabf@skynet.be>
Subject: linux-next: manual merge of the akpm-current tree with the vfs tree
Date: Mon, 13 Apr 2015 20:57:49 +1000	[thread overview]
Message-ID: <20150413205749.0c6dcf74@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 990 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
fs/affs/amigaffs.c between commit 5dd3dc06371a ("VFS: normal
filesystems (and lustre): d_inode() annotations") from the vfs tree and
commit 18da6e382823 ("fs/affs: use AFFS_MOUNT prefix for mount
options") 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@canb.auug.org.au

diff --cc fs/affs/amigaffs.c
index 40eb5814b98c,5022ac96aa40..000000000000

--- a/fs/affs/amigaffs.c
+++ b/fs/affs/amigaffs.c
@@@ -471,8 -471,9 +471,9 @@@ affs_warning(struct super_block *sb, co
  bool
  affs_nofilenametruncate(const struct dentry *dentry)
  {
 -	struct inode *inode = dentry->d_inode;
 +	struct inode *inode = d_inode(dentry);
- 	return AFFS_SB(inode->i_sb)->s_flags & SF_NO_TRUNCATE;
+ 
+ 	return affs_test_opt(AFFS_SB(inode->i_sb)->s_flags, SF_NO_TRUNCATE);
  
  }
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
