]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'fixes-2023-09-21' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Sep 2023 15:21:23 +0000 (08:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Sep 2023 15:21:23 +0000 (08:21 -0700)
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.


Trivial merge