From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 18 Jan 2022 04:26:50 +0000 (+0200)
Subject: Merge tag 'for-linus-5.17-ofs-1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.17-rc1~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f0033681f0fe8421baf8db125e57fa6157824c2d;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'for-linus-5.17-ofs-1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux

Pull orangefs fixes from Mike Marshall:
 "Two fixes:

   - Fix the size of a memory allocation in orangefs_bufmap_alloc()
     (Christophe JAILLET)

   - Use default_groups in kobj_type (Greg KH)"

* tag 'for-linus-5.17-ofs-1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
  orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc()
  orangefs: use default_groups in kobj_type
---

f0033681f0fe8421baf8db125e57fa6157824c2d