Merge tag 'for-linus-5.0-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubca...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Feb 2019 23:22:59 +0000 (15:22 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Feb 2019 23:22:59 +0000 (15:22 -0800)
Pull orangefs fixlet from Mike Marshall:
 "Remove two un-needed BUG_ONs"

* tag 'for-linus-5.0-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
  orangefs: remove two un-needed BUG_ONs...


Trivial merge