From 74b45b916de66a0be2a284205feb737c4ce37b17 Mon Sep 17 00:00:00 2001
From: Yousaf Kaukab <ykaukab@suse.de>
Date: Mar 22 2023 15:51:12 +0000
Subject: Merge remote-tracking branch 'origin/users/msuchanek/SLE15-SP5-GA/for-next' into SLE15-SP5-GA


Pull ppc64le config update from Michal Suchanek

---

diff --git a/config/ppc64le/default b/config/ppc64le/default
index 318ef76..78a8655 100644
--- a/config/ppc64le/default
+++ b/config/ppc64le/default
@@ -837,7 +837,7 @@ CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
-CONFIG_HWPOISON_INJECT=y
+CONFIG_HWPOISON_INJECT=m
 CONFIG_TRANSPARENT_HUGEPAGE=y
 # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
 CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y