From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 16 Jan 2022 04:43:14 +0000 (+0200)
Subject: Merge tag 'memblock-v5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt... 
X-Git-Tag: baikal/aarch64/sdk6.1~4874
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=572fb71f33c9f888748380e5a9ef47b317dc3805;p=kernel.git

Merge tag 'memblock-v5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock

Pull memblock cleanup from Mike Rapoport:
 "Remove #ifdef __KERNEL__ from memblock.h

  memblock.h is not a uAPI header, so __KERNEL__ guard can be deleted"

* tag 'memblock-v5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
  memblock: Remove #ifdef __KERNEL__ from memblock.h
---

572fb71f33c9f888748380e5a9ef47b317dc3805