From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Sep 2023 15:21:23 +0000 (-0700)
Subject: Merge tag 'fixes-2023-09-21' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt... 
X-Git-Tag: v6.6-rc3~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb8b1b93eed0f5ddb2f9903c2de2d9de8b372e8f;p=thirdparty%2Fkernel%2Fstable.git

Merge tag 'fixes-2023-09-21' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock

Pull memblock test fixes from Mike Rapoport:
 "Fix several compilation errors and warnings in memblock tests"

* tag 'fixes-2023-09-21' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
  memblock tests: fix warning ‘struct seq_file’ declared inside parameter list
  memblock tests: fix warning: "__ALIGN_KERNEL" redefined
  memblock tests: Fix compilation errors.
---

fb8b1b93eed0f5ddb2f9903c2de2d9de8b372e8f