924d18c02b
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:
|
||
|---|---|---|
| .. | ||
| Makefile | ||
| core.c | ||
| futex.h | ||
| pi.c | ||
| requeue.c | ||
| syscalls.c | ||
| waitwake.c | ||