commit 5c60a7389d795e001c8748b458eb76e3a5b6008c
author Linus Torvalds <torvalds@linux-foundation.org> Thu Aug 16 10:53:45 2018 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Aug 16 10:53:45 2018 -0700
tree 5ac51994e6ddfd438f99aecdf228506e871f3a78
parent b6d6a3076ac4eecb2d9cbcf17730fc160b94cadc
parent e1b437691a624a7e767bbb140c730d2779797f53

Merge tag 'for-linus-4.19-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux

Pull orangefs updates from Mike Marshall:
 "Orangefs: one cleanup and Souptick's vm_fault_t patch:

   - add new return type vm_fault_t (Souptick Joarder)

   - remove redundant pointer (Colin Ian King)"

* tag 'for-linus-4.19-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
  orangefs: remove redundant pointer orangefs_inode
  orangefs: Adding new return type vm_fault_t