JIRA: https://issues.redhat.com/browse/RHEL-53569
Upstream Status: v6.12-rc1
Conflicts:
DRM-backport will backport changes to the below
files, but since they are merged seperately, the
conflict is resolved here to keep this commit
building.
drivers/gpu/drm/msm/msm_drv.c
drivers/iommu/iommufd/selftest.c
drivers/misc/xilinx_tmr_inject.c
No functional changes are intended for these files
but since the codebase in v5.17 has diverged substantially
from upstream this commit does not apply cleanly.
include/ufs/ufshcd.h
kernel/futex/core.c
mm/fail_page_alloc.c
mm/failslab.c
commit 6ce2082fd3a25d5a8c756120959237cace0379f1
Author: Jani Nikula <jani.nikula@intel.com>
AuthorDate: Tue Aug 13 15:12:35 2024 +0300
Commit: Andrew Morton <akpm@linux-foundation.org>
CommitDate: Sun Sep 1 20:43:33 2024 -0700
The fault-inject.h users across the kernel need to add a lot of #ifdef
CONFIG_FAULT_INJECTION to cater for shortcomings in the header. Make
fault-inject.h self-contained for CONFIG_FAULT_INJECTION=n, and add stubs
for DECLARE_FAULT_ATTR(), setup_fault_attr(), should_fail_ex(), and
should_fail() to allow removal of conditional compilation.
[akpm@linux-foundation.org: repair fallout from no longer including debugfs.h into fault-inject.h]
[akpm@linux-foundation.org: fix drivers/misc/xilinx_tmr_inject.c]
[akpm@linux-foundation.org: Add debugfs.h inclusion to more files, per Stephen]
Link: https://lkml.kernel.org/r/20240813121237.2382534-1-jani.nikula@intel.com
Fixes: 6ff1cb355e ("[PATCH] fault-injection capabilities infrastructure")
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Cc: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Abhinav Kumar <quic_abhinavk@quicinc.com>
Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Cc: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Robert Foss <rfoss@redhat.com>
JIRA: https://issues.redhat.com/browse/RHEL-20141
commit 0866e82e40fba45dae07e6e8385929b574201752
Author: Kefeng Wang <wangkefeng.wang@huawei.com>
Date: Tue May 16 14:38:15 2023 +0800
mm: page_alloc: split out FAIL_PAGE_ALLOC
... to a single file to reduce a bit of page_alloc.c.
Link: https://lkml.kernel.org/r/20230516063821.121844-8-wangkefeng.wang@huawei.com
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: "Huang, Ying" <ying.huang@intel.com>
Cc: Iurii Zaikin <yzaikin@google.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Len Brown <len.brown@intel.com>
Cc: Luis Chamberlain <mcgrof@kernel.org>
Cc: Mike Rapoport (IBM) <rppt@kernel.org>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Rafael J. Wysocki <rafael@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Chris von Recklinghausen <crecklin@redhat.com>
Robert Foss
Chris von Recklinghausen