+39
−38
Loading
mainline inclusion from mainline-v6.10-rc1 commit 610ff817b981921213ae51e5c5f38c76c6f0405e category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IAXCD2 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=610ff817b981921213ae51e5c5f38c76c6f0405e -------------------------------- Use new_folio throughout where we had been using hpage. Link: https://lkml.kernel.org/r/20240403171838.1445826-6-willy@infradead.org Signed-off-by:Matthew Wilcox (Oracle) <willy@infradead.org> Reviewed-by:
Vishal Moola (Oracle) <vishal.moola@gmail.com> Signed-off-by:
Andrew Morton <akpm@linux-foundation.org> Conflicts: mm/khugepaged.c [return val conflict for copy_mc_user_highpage, which is introduced by commit 681be068 ("mm/hwpoison: return -EFAULT when copy fail in copy_mc_[user]_highpage()")] Signed-off-by:
Nanyong Sun <sunnanyong@huawei.com>