mirror of
https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10.git
synced 2026-09-09 00:07:04 +08:00
Rafael Aquini
42524db5a7
JIRA: https://redhat.atlassian.net/browse/RHEL-145694
Conflicts:
* drivers/vfio/pci/mlx5/cmd.c: conflicts due to out-of-order backport of
upstream commit 089803c40193 ("vfio/mlx5: Enable the DMA link API").
* fs/xfs/xfs_buf.c: hunk dropped due to out-of-order backport of upstream
commit e2874632a621 ("xfs: use vmalloc instead of vm_map_area for buffer
backing memory")
* net/sunrpc/svc.c: hunk dropped due to out-of-order backport of
upstream commit 42229c5d45 ("sunrpc: Replace the rq_pages array
with dynamically-allocated memory")
* net/sunrpc/svc_xprt.c: minor hunk difference due to out-of-order backport of
upstream commit ee66b9e3e1c6 ("SUNRPC: Allocate a separate Reply page array")
* io_uring/memmap.c: hunk added to mirror the fix introduced with
upstream merge commit 9c5968db9e62 ("Merge tag 'mm-stable-2025-01-26-14-59'
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm")
commit 6bf9b5b40af373690313f64a3935b2bf2e5d46d9
Author: Luiz Capitulino <luizcap@redhat.com>
Date: Mon Dec 23 17:00:38 2024 -0500
mm: alloc_pages_bulk: rename API
The previous commit removed the page_list argument from
alloc_pages_bulk_noprof() along with the alloc_pages_bulk_list() function.
Now that only the *_array() flavour of the API remains, we can do the
following renaming (along with the _noprof() ones):
alloc_pages_bulk_array -> alloc_pages_bulk
alloc_pages_bulk_array_mempolicy -> alloc_pages_bulk_mempolicy
alloc_pages_bulk_array_node -> alloc_pages_bulk_node
Link: https://lkml.kernel.org/r/275a3bbc0be20fbe9002297d60045e67ab3d4ada.1734991165.git.luizcap@redhat.com
Signed-off-by: Luiz Capitulino <luizcap@redhat.com>
Acked-by: David Hildenbrand <david@redhat.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Yunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Rafael Aquini <raquini@redhat.com>