]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge tag 'for-linus-6.15-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Mar 2025 20:14:39 +0000 (13:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Mar 2025 20:14:39 +0000 (13:14 -0700)
Pull orangefs update from Mike Marshall:

 - remove two orangefs bufmap routines that no longer have callers

* tag 'for-linus-6.15-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
  orangefs: Bufmap deadcoding


Trivial merge