From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 8 Feb 2020 01:52:38 +0000 (-0800)
Subject: Merge tag 'for-linus-5.6-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubca... 
X-Git-Tag: v5.15~4513
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=60ea27e936f2b9b7f011644a499c292f9cc11de3;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'for-linus-5.6-ofs1' of git://git./linux/kernel/git/hubcap/linux

Pull orangefs fix from Mike Marshall:
 "Debugfs fix for orangefs.

  Vasliy Averin noticed that 'if seq_file .next function does not change
  position index, read after some lseek can generate unexpected output'
  and sent in this fix"

* tag 'for-linus-5.6-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
  help_next should increase position index
---

60ea27e936f2b9b7f011644a499c292f9cc11de3