An error occurred while fetching folder content.
Frantisek Hrbata
authored
Merge conflicts: ----------------- Conflicts with !1142(merged) "io_uring: update to v5.15" fs/io-wq.c - static bool io_wqe_create_worker(struct io_wqe *wqe, struct io_wqe_acct *acct) !1142 already contains backport of 3146cba9 ("io-wq: make worker creation resilient against signals") along with other commits which are not present in !1370. Resolved in favor of HEAD(!1142) - static int io_wqe_worker(void *data) !1370 does not contain 767a65e9 ("io-wq: fix potential race of acct->nr_workers") Resolved in favor of HEAD(!1142) - static void io_init_new_worker(struct io_wqe *wqe, struct io_worker *worker, HEAD(!1142) does not contain e32cf5df ("kthread: Generalize pf_io_worker so it can point to struct kthread") Resolved in favor of !1370 - static void create_worker_cont(struct callback_head *cb) !1370 does not contain 66e70be7 ("io-wq: fix memory leak in create_io_worker()") Resolved in favor of HEAD(!1142) - static void io_workqueue_create(struct work_struct *work) !1370 does not contain 66e70be7 ("io-wq: fix memory leak in create_io_worker()") Resolved in favor of HEAD(!1142) - static bool create_io_worker(struct io_wq *wq, struct io_wqe *wqe, int index) !1370 does not contain 66e70be7 ("io-wq: fix memory leak in create_io_worker()") Resolved in favor of HEAD(!1142) - static bool io_wq_work_match_item(struct io_wq_work *work, void *data) !1370 does not contain 713b9825 ("io-wq: fix cancellation on create-worker failure") Resolved in favor of HEAD(!1142) - static void io_wqe_enqueue(struct io_wqe *wqe, struct io_wq_work *work) !1370 is missing 713b9825 ("io-wq: fix cancellation on create-worker failure") removed wrongly merged run_cancel label Resolved in favor of HEAD(!1142) - static bool io_task_work_match(struct callback_head *cb, void *data) !1370 is missing 3b33e3f4 ("io-wq: fix silly logic error in io_task_work_match()") Resolved in favor of HEAD(!1142) - static void io_wq_exit_workers(struct io_wq *wq) !1370 is missing 3b33e3f4 ("io-wq: fix silly logic error in io_task_work_match()") Resolved in favor of HEAD(!1142) - int io_wq_max_workers(struct io_wq *wq, int *new_count) !1370 is missing 3b33e3f4 ("io-wq: fix silly logic error in io_task_work_match()") fs/io_uring.c - static int io_register_iowq_max_workers(struct io_ring_ctx *ctx, !1370 is missing bunch of commits after 2e480058 ("io-wq: provide a way to limit max number of workers") Resolved in favor of HEAD(!1142) include/uapi/linux/io_uring.h - !1370 is missing dd47c104 ("io-wq: provide IO_WQ_* constants for IORING_REGISTER_IOWQ_MAX_WORKERS arg items") just a comment conflict Resolved in favor of HEAD(!1142) kernel/exit.c - void __noreturn do_exit(long code) - !1370 contains bunch of commits after f552a27a ("io_uring: remove files pointer in cancellation functions") Resolved in favor of !1370 Conflicts with !1357(merged) "NFS refresh for RHEL-9.2" fs/nfs/callback.c - nfs4_callback_svc(void *vrqstp) !1370 is missing f49169c9 ("NFSD: Remove svc_serv_ops::svo_module") where the module_put_and_kthread_exit() was removed Resolved in favor of HEAD(!1357) fs/nfs/file.c !1357 is missing 187c82cb ("fs: Convert trivial uses of __set_page_dirty_nobuffers to filemap_dirty_folio") Resolved in favor of HEAD(!1370) fs/nfsd/nfssvc.c - nfsd(void *vrqstp) !1370 is missing f49169c9 ("NFSD: Remove svc_serv_ops::svo_module") Resolved in favor of HEAD(!1357) ----------------- MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/1370 Bugzilla: https://bugzilla.redhat.com/2120352 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2099722 Patches 1-9 are changes to selftests Patches 10-31 are reverts of RHEL-only patches to address COR CVE Patches 32-320 are the machine dependent mm changes ported by Rafael Patch 321 reverts the backport of 6692c98c. See below. Patches 322-981 are the machine independent mm changes Patches 982-1016 are David Hildebrand's upstream changes to address the COR CVE RHEL commit b23c2989 fork: Stop protecting back_fork_cleanup_cgroup_lock with CONFIG_NUMA which is a backport of upstream 6692c98c and is reverted early in this series. 6692c98c is a fix for upstream 40966e31 which was not in RHEL until this series. 6692c98c is re-added after 40966e31. Omitted-fix: 310d1344 ("Revert "powerpc: Remove unused FW_FEATURE_NATIVE references"") to be fixed under https://bugzilla.redhat.com/show_bug.cgi?id=2131716 Omitted-fix: 465d0eb0 ("Docs/admin-guide/mm/damon/usage: fix the example code snip") to be fixed under https://bugzilla.redhat.com/show_bug.cgi?id=2131716 Omitted-fix: 31731452 ("mm/hugetlb: correct demote page offset logic") to be fixed under https://bugzilla.redhat.com/show_bug.cgi?id=2131716 Omitted-fix: 37dcc673 ("frontswap: don't call ->init if no ops are registered") to be fixed under https://bugzilla.redhat.com/show_bug.cgi?id=2131716 Omitted-fix: 30c19366 ("mm: fix BUG splat with kvmalloc + GFP_ATOMIC") to be fixed under https://bugzilla.redhat.com/show_bug.cgi?id=2131716 Omitted: fix: fa84693b io_uring: ensure IORING_REGISTER_IOWQ_MAX_WORKERS works with SQPOLL fixed under https://bugzilla.redhat.com/show_bug.cgi?id=2107656 Omitted-fix: 009ad9f0 io_uring: drop ctx->uring_lock before acquiring sqd->lock fixed under https://bugzilla.redhat.com/show_bug.cgi?id=2107656 Omitted-fix: bc369921 io-wq: max_worker fixes fixed under https://bugzilla.redhat.com/show_bug.cgi?id=2107743 Omitted-fix: e139a1ec io_uring: apply max_workers limit to all future users fixed under https://bugzilla.redhat.com/show_bug.cgi?id=2107743 Omitted-fix: 71c9ce27 io-wq: fix max-workers not correctly set on multi-node system fixed under https://bugzilla.redhat.com/show_bug.cgi?id=2107743 Omitted-fix: 41d3a6bd io_uring: pin SQPOLL data before unlocking ring lock fixed under https://bugzilla.redhat.com/show_bug.cgi?id=2107656 Omitted-fix: bad119b9 io_uring: honour zeroes as io-wq worker limits fixed under https://bugzilla.redhat.com/show_bug.cgi?id=2107743 Omitted-fix: 08bdbd39 io-wq: ensure that hash wait lock is IRQ disabling fixed under https://bugzilla.redhat.com/show_bug.cgi?id=2107656 Omitted-fix: 713b9825 io-wq: fix cancellation on create-worker failure fixed under https://bugzilla.redhat.com/show_bug.cgi?id=2107656 Omitted-fix: 3b33e3f4 io-wq: fix silly logic error in io_task_work_match() fixed under https://bugzilla.redhat.com/show_bug.cgi?id=2107656 Omitted-fix: 71e1cef2 io-wq: Remove duplicate code in io_workqueue_create() fixed under https://bugzilla.redhat.com/show_bug.cgi?id=210774 Omitted-fix: a226abcd io-wq: don't retry task_work creation failure on fatal conditions fixed under https://bugzilla.redhat.com/show_bug.cgi?id=2107743 Omitted-fix: fa84693b io_uring: ensure IORING_REGISTER_IOWQ_MAX_WORKERS works with SQPOLL fixed under https://bugzilla.redhat.com/show_bug.cgi?id=2107656 Omitted-fix: dd47c104 io-wq: provide IO_WQ_* constants for IORING_REGISTER_IOWQ_MAX_WORKERS arg items fixed under https://bugzilla.redhat.com/show_bug.cgi?id=2107656 Omitted-fix: 4f0712cc hexagon: Fix function name in die() unsupported arch Omitted-fix: 751971af csky: Fix function name in csky_alignment() and die() unsupported arch Omitted-fix: dcbc65aa ptrace: Remove duplicated include in ptrace.c unsupported arch Omitted-fix: eb48d421 drm/i915: Fix oops due to missing stack depot fixed in RHEL commit 105d2d48 Merge DRM changes from upstream v5.16..v5.17 Omitted-fix: 751a9d69 drm/i915: Fix oops due to missing stack depot fixed in RHEL commit 99fc716f Merge DRM changes from upstream v5.17..v5.18 Omitted-fix: eb48d421 drm/i915: Fix oops due to missing stack depot fixed in RHEL commit 105d2d48 Merge DRM changes from upstream v5.16..v5.17 Omitted-fix: 751a9d69 drm/i915: Fix oops due to missing stack depot fixed in RHEL commit 99fc716f Merge DRM changes from upstream v5.17..v5.18 Omitted-fix: b95dc06a drm/amdgpu: disable runpm if we are the primary adapter reverted later Omitted-fix: 5a90c24a Revert "drm/amdgpu: disable runpm if we are the primary adapter" revert of above omitted fix Omitted-fix: 724bbe49 fs/ntfs3: provide block_invalidate_folio to fix memory leak unsupported fs Signed-off-by:Chris von Recklinghausen <crecklin@redhat.com> Approved-by:
John W. Linville <linville@redhat.com> Approved-by:
Jiri Benc <jbenc@redhat.com> Approved-by:
Jarod Wilson <jarod@redhat.com> Approved-by:
Prarit Bhargava <prarit@redhat.com> Approved-by:
Lyude Paul <lyude@redhat.com> Approved-by:
Donald Dutile <ddutile@redhat.com> Approved-by:
Rafael Aquini <aquini@redhat.com> Approved-by:
Phil Auld <pauld@redhat.com> Approved-by:
Waiman Long <longman@redhat.com> Signed-off-by:
Frantisek Hrbata <fhrbata@redhat.com>
Name | Last commit | Last update |
---|---|---|
.. |