summaryrefslogtreecommitdiffstats
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-01-08 11:54:24 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2023-01-08 11:54:24 +0100
commite9ffbf16caa6cb596df7fd641bc6063a922c52e6 (patch)
tree027bb4eea13be27e960fc2df4e9ad3ca64cb8775 /block/blk-merge.c
parentMerge tag 'nfs-for-6.2-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (diff)
parentmemblock: Fix doc for memblock_phys_free (diff)
downloadlinux-e9ffbf16caa6cb596df7fd641bc6063a922c52e6.tar.xz
linux-e9ffbf16caa6cb596df7fd641bc6063a922c52e6.zip
Merge tag 'fixes-2023-01-08' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock
Pull memblock fixes from Mike Rapoport: "Small fixes in kernel-doc and tests: - Fix kernel-doc for memblock_phys_free() to use correct names for the counterpart allocation methods - Fix compilation error in memblock tests" * tag 'fixes-2023-01-08' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock: memblock: Fix doc for memblock_phys_free memblock tests: Fix compilation error.
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions