The patch titled Subject: mm-cma-allocate-cma-areas-bottom-up-fix has been added to the -mm tree. Its filename is mm-cma-allocate-cma-areas-bottom-up-fix.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-cma-allocate-cma-areas-bottom-up-fix.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-cma-allocate-cma-areas-bottom-up-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Roman Gushchin <guro@xxxxxx> Subject: mm-cma-allocate-cma-areas-bottom-up-fix whitespace fix, per Mike Link: https://lkml.kernel.org/r/20201221170551.GB3428478@xxxxxxxxxxxxxxxxxxxxxxxxxxx Signed-off-by: Roman Gushchin <guro@xxxxxx> Reviewed-by: Mike Rapoport <rppt@xxxxxxxxxxxxx> Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxxx> Cc: Wonhyuk Yang <vvghjk1234@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/cma.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/mm/cma.c~mm-cma-allocate-cma-areas-bottom-up-fix +++ a/mm/cma.c @@ -344,8 +344,7 @@ int __init cma_declare_contiguous_nid(ph * Avoid using first 4GB to not interfere with constrained zones * like DMA/DMA32. */ - if (!memblock_bottom_up() && - memblock_end >= SZ_4G + size) { + if (!memblock_bottom_up() && memblock_end >= SZ_4G + size) { memblock_set_bottom_up(true); addr = memblock_alloc_range_nid(size, alignment, SZ_4G, limit, nid, true); _ Patches currently in -mm which might be from guro@xxxxxx are mm-slub-call-account_slab_page-after-slab-page-initialization.patch mm-memcg-slab-pre-allocate-obj_cgroups-for-slab-caches-with-slab_account.patch mm-cma-allocate-cma-areas-bottom-up.patch mm-cma-allocate-cma-areas-bottom-up-fix.patch memblock-do-not-start-bottom-up-allocations-with-kernel_end.patch mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings.patch mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix.patch