From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 8 Jan 2023 10:54:24 +0000 (-0800)
Subject: Merge tag 'fixes-2023-01-08' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt... 
X-Git-Tag: v6.6.7~3771
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e9ffbf16caa6cb596df7fd641bc6063a922c52e6;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'fixes-2023-01-08' of git://git./linux/kernel/git/rppt/memblock

Pull memblock fixes from Mike Rapoport:
 "Small fixes in kernel-doc and tests:

   - Fix kernel-doc for memblock_phys_free() to use correct names for
     the counterpart allocation methods

   - Fix compilation error in memblock tests"

* tag 'fixes-2023-01-08' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
  memblock: Fix doc for memblock_phys_free
  memblock tests: Fix compilation error.
---

e9ffbf16caa6cb596df7fd641bc6063a922c52e6