From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Aug 2018 17:53:45 +0000 (-0700)
Subject: Merge tag 'for-linus-4.19-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=5c60a7389d795e001c8748b458eb76e3a5b6008c;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'for-linus-4.19-ofs1' of git://git./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
---

5c60a7389d795e001c8748b458eb76e3a5b6008c