]> www.infradead.org Git - users/willy/xarray.git/commit
projects / users / willy / xarray.git / commit
summary | shortlog | log | commit | commitdiff | tree
(parent: 259043e) | patch
mm/hugetlb.c: undo errant change
authorAndrew Morton <akpm@linux-foundation.org>
Fri, 12 Jul 2024 06:36:42 +0000 (23:36 -0700)
committerAndrew Morton <akpm@linux-foundation.org>
Fri, 12 Jul 2024 22:52:08 +0000 (15:52 -0700)
commit998d4e2c33be49297c780e0e59a333918b7c97e4
tree502d14d829e47c1cb9d883baa57dcbebbbe176a0tree
parent259043e3b730e0aa6408bff27af7edf7a5c9101ccommit | diff
mm/hugetlb.c: undo errant change

During conflict resolution a line was unintentionally removed by a ksm.c
patch.

Link: https://lkml.kernel.org/r/85b0d694-d1ac-8e7a-2e50-1edc03eee21a@google.com
Fixes: ac90c56bbd73 ("mm/ksm: refactor out try_to_merge_with_zero_page()")
Reported-by: Hugh Dickins <hughd@google.com>
Cc: Aristeu Rozanski <aris@redhat.com>
Cc: Chengming Zhou <chengming.zhou@linux.dev>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/hugetlb.c diff | blob | history
XArray, radix tree and IDR