Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git
# Conflicts: # mm/memblock.c
Showing
- Documentation/admin-guide/kernel-parameters.txt 22 additions, 0 deletionsDocumentation/admin-guide/kernel-parameters.txt
- Documentation/admin-guide/ramoops.rst 13 additions, 0 deletionsDocumentation/admin-guide/ramoops.rst
- fs/pstore/ram.c 14 additions, 0 deletionsfs/pstore/ram.c
- include/linux/memblock.h 1 addition, 20 deletionsinclude/linux/memblock.h
- include/linux/mm.h 2 additions, 0 deletionsinclude/linux/mm.h
- mm/memblock.c 135 additions, 16 deletionsmm/memblock.c
- mm/mm_init.c 31 additions, 38 deletionsmm/mm_init.c
- tools/include/linux/mm.h 1 addition, 0 deletionstools/include/linux/mm.h
- tools/include/linux/numa.h 5 additions, 0 deletionstools/include/linux/numa.h
- tools/testing/memblock/tests/basic_api.c 310 additions, 4 deletionstools/testing/memblock/tests/basic_api.c
- tools/testing/memblock/tests/common.c 4 additions, 4 deletionstools/testing/memblock/tests/common.c
- tools/testing/memblock/tests/common.h 4 additions, 0 deletionstools/testing/memblock/tests/common.h
Loading
Please register or sign in to comment