From: Linus Torvalds Date: Sun, 27 Mar 2022 20:36:06 +0000 (-0700) Subject: Merge tag 'memblock-v5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt... X-Git-Tag: microblaze-v5.19~98 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=02f9a04d76b76b80b05ddc33ceabe806b84fda3c;p=linux-2.6-microblaze.git Merge tag 'memblock-v5.18-rc1' of git://git./linux/kernel/git/rppt/memblock Pull memblock updates from Mike Rapoport: "Test suite and a small cleanup: - A small cleanup of unused variable in __next_mem_pfn_range_in_zone - Initial test suite to simulate memblock behaviour in userspace" * tag 'memblock-v5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock: (27 commits) memblock tests: Add TODO and README files memblock tests: Add memblock_alloc_try_nid tests for bottom up memblock tests: Add memblock_alloc_try_nid tests for top down memblock tests: Add memblock_alloc_from tests for bottom up memblock tests: Add memblock_alloc_from tests for top down memblock tests: Add memblock_alloc tests for bottom up memblock tests: Add memblock_alloc tests for top down memblock tests: Add simulation of physical memory memblock tests: Split up reset_memblock function memblock tests: Fix testing with 32-bit physical addresses memblock: __next_mem_pfn_range_in_zone: remove unneeded local variable nid memblock tests: Add memblock_free tests memblock tests: Add memblock_add_node test memblock tests: Add memblock_remove tests memblock tests: Add memblock_reserve tests memblock tests: Add memblock_add tests memblock tests: Add memblock reset function memblock tests: Add skeleton of the memblock simulator tools/include: Add debugfs.h stub tools/include: Add pfn.h stub ... --- 02f9a04d76b76b80b05ddc33ceabe806b84fda3c diff --cc MAINTAINERS index d55cb69c1229,38502bf0231a..b555a5e8704f --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -12550,9 -12423,10 +12550,10 @@@ S: Maintaine F: Documentation/core-api/boot-time-mm.rst F: include/linux/memblock.h F: mm/memblock.c + F: tools/testing/memblock/ MEMORY CONTROLLER DRIVERS -M: Krzysztof Kozlowski +M: Krzysztof Kozlowski L: linux-kernel@vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git