From: Alex Elder <aelder@sgi.com>
Date: Tue, 11 Jan 2011 03:35:55 +0000 (-0600)
Subject: Merge branch 'master' into for-linus-merged
X-Git-Tag: v2.6.38-rc1~412^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92f1c008ae79e32b83c0607d184b194f302bb3ee;p=pandora-kernel.git

Merge branch 'master' into for-linus-merged

This merge pulls the XFS master branch into the latest Linus master.
This results in a merge conflict whose best fix is not obvious.
I manually fixed the conflict, in "fs/xfs/xfs_iget.c".

Dave Chinner had done work that resulted in RCU freeing of inodes
separate from what Nick Piggin had done, and their results differed
slightly in xfs_inode_free().  The fix updates Nick's call_rcu()
with the use of VFS_I(), while incorporating needed updates to some
XFS inode fields implemented in Dave's series.  Dave's RCU callback
function has also been removed.

Signed-off-by: Alex Elder <aelder@sgi.com>
---

92f1c008ae79e32b83c0607d184b194f302bb3ee
Reading git-diff-tree failed