From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Sep 2014 21:04:17 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
X-Git-Tag: MMI-PSA29.97-13-9~11566
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7ec62d421bdf29cb31101ae2689f7f3a9906289a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-fs

Pull UDF fixes from Jan Kara:
 "Fixes for UDF handling of NFS handles and one fix for proper handling
  of corrupted media"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  udf: saner calling conventions for udf_new_inode()
  udf: fix the udf_iget() vs. udf_new_inode() races
  udf: merge the pieces inserting a new non-directory object into directory
  udf: Set i_generation field
  udf: Properly detect stale inodes
  udf: Make udf_read_inode() and udf_iget() return error
  udf: Avoid infinite loop when processing indirect ICBs
  udf: Fold udf_fill_inode() into __udf_read_inode()
  udf: Avoid dir link count to go negative
---

7ec62d421bdf29cb31101ae2689f7f3a9906289a