Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2018-05-17 07:15:07 +0200
committerKernel Build Daemon <kbuild@suse.de>2018-05-17 07:15:07 +0200
commit19dcc0f0c991f18ce798a69a1587e92c78829592 (patch)
tree10536fafa39c4996654f524fffbab6676d40ddd6
parenta9fee0989a17203b0fa48196e464a738f1222412 (diff)
parent8e814f378044fa69d0a26e21dfc829b6d2d1af5c (diff)
Merge branch 'SLE15' into openSUSE-15.0
-rw-r--r--blacklist.conf1
-rw-r--r--patches.arch/powerpc-64-kexec-fix-race-in-kexec-when-XIVE-is-shut.patch23
-rw-r--r--patches.arch/powerpc-xive-fix-hcall-H_INT_RESET-to-support-long-b.patch26
-rw-r--r--patches.arch/powerpc-xive-prepare-all-hcalls-to-support-long-busy.patch26
-rw-r--r--patches.arch/powerpc-xive-shutdown-XIVE-when-kexec-or-kdump-is-pe.patch16
-rw-r--r--patches.suse/0008-kabi-arm64-reserve-space-in-cpu_hwcaps-and-cpu_hwcap.patch (renamed from patches.kabi/0008-kabi-arm64-reserve-space-in-cpu_hwcaps-and-cpu_hwcap.patch)0
-rw-r--r--patches.suse/reiserfs-mark-read-write-mode-unsupported.patch66
-rw-r--r--patches.suse/unsupported-features.patch34
-rw-r--r--rpm/package-descriptions6
-rw-r--r--series.conf15
-rw-r--r--supported.conf2
11 files changed, 163 insertions, 52 deletions
diff --git a/blacklist.conf b/blacklist.conf
index 7912a17003..e28d98cd75 100644
--- a/blacklist.conf
+++ b/blacklist.conf
@@ -334,3 +334,4 @@ a743bbeef27b9176987ec0cb7f906ab0ab52d1da # not relevant: PPro
590347e4000356f55eb10b03ced2686bd74dab40 # compiler warning for gcc-version < 6.3
0063ec4459dcf1583c7aa84ada0f7125450d9245 # cosmetic issue only
ddc212313f16cd65fcf5e8d9ae223f8374822e4d # small optimisation for old compilers
+2796d303e3c5ec213c578ed3a66872205c126eb8 # RMDA unsupported in cifs.ko
diff --git a/patches.arch/powerpc-64-kexec-fix-race-in-kexec-when-XIVE-is-shut.patch b/patches.arch/powerpc-64-kexec-fix-race-in-kexec-when-XIVE-is-shut.patch
index ab68e01574..27cffb1b23 100644
--- a/patches.arch/powerpc-64-kexec-fix-race-in-kexec-when-XIVE-is-shut.patch
+++ b/patches.arch/powerpc-64-kexec-fix-race-in-kexec-when-XIVE-is-shut.patch
@@ -1,33 +1,40 @@
-From 44baf8baea79a0f8e4d41105d0585f83c33f6d53 Mon Sep 17 00:00:00 2001
+From d2b04b0c78881ef1c051cc3a4a2c61b7bf91aa53 Mon Sep 17 00:00:00 2001
From: Cédric Le Goater <clg@kaod.org>
-Date: Tue, 3 Apr 2018 09:15:45 +0200
-Subject: [PATCH 1/4] powerpc/64/kexec: fix race in kexec when XIVE is
- shutdowned
+Date: Tue, 8 May 2018 09:05:14 +0200
+Subject: [PATCH] powerpc/64/kexec: fix race in kexec when XIVE is shutdown
References: bsc#1088273
-Patch-mainline: submitted https://patchwork.ozlabs.org/cover/894465/
+Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
+Patch-mainline: queued
+Git-commit: d2b04b0c78881ef1c051cc3a4a2c61b7bf91aa53
The kexec_state KEXEC_STATE_IRQS_OFF barrier is reached by all
secondary CPUs before the kexec_cpu_down() operation is called on
secondaries. This can raise conflicts and provoque errors in the XIVE
-hcalls when XIVE is shutdowned with H_INT_RESET on the primary CPU.
+hcalls when XIVE is shutdown with H_INT_RESET on the primary CPU.
To synchronize the kexec_cpu_down() operations and make sure the
secondaries have completed their task before the primary starts doing
the same, let's move the primary kexec_cpu_down() after the
KEXEC_STATE_REAL_MODE barrier.
+This change of the ending sequence of kexec is mostly useful on the
+pseries platform but it impacts also the powernv, ps3 and 85xx
+platforms. powernv can be easily tested and fixed but some caution is
+required for the other two.
+
Signed-off-by: Cédric Le Goater <clg@kaod.org>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Acked-by: Michal Suchanek <msuchanek@suse.de>
---
arch/powerpc/kernel/machine_kexec_64.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c
-index 49d34d7271e7..212ecb8e829c 100644
+index 1044bf15d5ed..a0f6f45005bd 100644
--- a/arch/powerpc/kernel/machine_kexec_64.c
+++ b/arch/powerpc/kernel/machine_kexec_64.c
-@@ -230,16 +230,16 @@ static void kexec_prepare_cpus(void)
+@@ -231,16 +231,16 @@ static void kexec_prepare_cpus(void)
/* we are sure every CPU has IRQs off at this point */
kexec_all_irq_disabled = 1;
diff --git a/patches.arch/powerpc-xive-fix-hcall-H_INT_RESET-to-support-long-b.patch b/patches.arch/powerpc-xive-fix-hcall-H_INT_RESET-to-support-long-b.patch
index f40f3bce2f..fe0e6db390 100644
--- a/patches.arch/powerpc-xive-fix-hcall-H_INT_RESET-to-support-long-b.patch
+++ b/patches.arch/powerpc-xive-fix-hcall-H_INT_RESET-to-support-long-b.patch
@@ -1,24 +1,27 @@
-From e7da80989e7595cd71844710ad4cbe256f2bc581 Mon Sep 17 00:00:00 2001
+From 028555a590d647eb75b975b05dacc35748626469 Mon Sep 17 00:00:00 2001
From: Cédric Le Goater <clg@kaod.org>
-Date: Tue, 3 Apr 2018 09:15:46 +0200
-Subject: [PATCH 2/4] powerpc/xive: fix hcall H_INT_RESET to support long busy
+Date: Tue, 8 May 2018 09:05:15 +0200
+Subject: [PATCH] powerpc/xive: fix hcall H_INT_RESET to support long busy
delays
References: bsc#1088273
-Patch-mainline: submitted https://patchwork.ozlabs.org/cover/894465/
+Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
+Patch-mainline: queued
+Git-commit: 028555a590d647eb75b975b05dacc35748626469
The hcall H_INT_RESET can take some time to complete and in such cases
it returns H_LONG_BUSY_* codes requiring the machine to sleep for a
while before retrying.
Signed-off-by: Cédric Le Goater <clg@kaod.org>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Acked-by: Michal Suchanek <msuchanek@suse.de>
---
- arch/powerpc/sysdev/xive/spapr.c | 53 ++++++++++++++++++++++++++++++++++++----
- 1 file changed, 48 insertions(+), 5 deletions(-)
+ arch/powerpc/sysdev/xive/spapr.c | 52 ++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 47 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/sysdev/xive/spapr.c b/arch/powerpc/sysdev/xive/spapr.c
-index 091f1d0d0af1..7113f5d87952 100644
+index 091f1d0d0af1..864de3a733c7 100644
--- a/arch/powerpc/sysdev/xive/spapr.c
+++ b/arch/powerpc/sysdev/xive/spapr.c
@@ -19,6 +19,7 @@
@@ -29,7 +32,7 @@ index 091f1d0d0af1..7113f5d87952 100644
#include <asm/prom.h>
#include <asm/io.h>
-@@ -108,6 +109,52 @@ static void xive_irq_bitmap_free(int irq)
+@@ -108,6 +109,51 @@ static void xive_irq_bitmap_free(int irq)
}
}
@@ -52,10 +55,9 @@ index 091f1d0d0af1..7113f5d87952 100644
+{
+ unsigned int ms;
+
-+ might_sleep();
+ ms = plpar_busy_delay_time(rc);
-+ if (ms && need_resched())
-+ msleep(ms);
++ if (ms)
++ mdelay(ms);
+
+ return ms;
+}
@@ -82,7 +84,7 @@ index 091f1d0d0af1..7113f5d87952 100644
static long plpar_int_get_source_info(unsigned long flags,
unsigned long lisn,
unsigned long *src_flags,
-@@ -445,11 +492,7 @@ static void xive_spapr_put_ipi(unsigned int cpu, struct xive_cpu *xc)
+@@ -445,11 +491,7 @@ static void xive_spapr_put_ipi(unsigned int cpu, struct xive_cpu *xc)
static void xive_spapr_shutdown(void)
{
diff --git a/patches.arch/powerpc-xive-prepare-all-hcalls-to-support-long-busy.patch b/patches.arch/powerpc-xive-prepare-all-hcalls-to-support-long-busy.patch
index 202e613797..38fe19af44 100644
--- a/patches.arch/powerpc-xive-prepare-all-hcalls-to-support-long-busy.patch
+++ b/patches.arch/powerpc-xive-prepare-all-hcalls-to-support-long-busy.patch
@@ -1,11 +1,12 @@
-From 0556c5a9a6e567441b05c4453ab974288f1dfe19 Mon Sep 17 00:00:00 2001
+From 282498d65fb4740c2e9212a79c6888887d0be6cf Mon Sep 17 00:00:00 2001
From: Cédric Le Goater <clg@kaod.org>
-Date: Tue, 3 Apr 2018 09:15:48 +0200
-Subject: [PATCH 4/4] powerpc/xive: prepare all hcalls to support long busy
- delays
+Date: Tue, 8 May 2018 09:05:17 +0200
+Subject: [PATCH] powerpc/xive: prepare all hcalls to support long busy delays
References: bsc#1088273
-Patch-mainline: submitted https://patchwork.ozlabs.org/cover/894465/
+Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
+Patch-mainline: queued
+Git-commit: 282498d65fb4740c2e9212a79c6888887d0be6cf
This is not the case for the moment, but future releases of pHyp might
need to introduce some synchronisation routines under the hood which
@@ -15,16 +16,17 @@ As this was done for H_INT_RESET, let's wrap the other hcalls in a
loop catching the H_LONG_BUSY_* codes.
Signed-off-by: Cédric Le Goater <clg@kaod.org>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Acked-by: Michal Suchanek <msuchanek@suse.de>
---
arch/powerpc/sysdev/xive/spapr.c | 36 ++++++++++++++++++++++++++++--------
1 file changed, 28 insertions(+), 8 deletions(-)
diff --git a/arch/powerpc/sysdev/xive/spapr.c b/arch/powerpc/sysdev/xive/spapr.c
-index 7113f5d87952..97ea0a67a173 100644
+index 864de3a733c7..575db3b06a6b 100644
--- a/arch/powerpc/sysdev/xive/spapr.c
+++ b/arch/powerpc/sysdev/xive/spapr.c
-@@ -165,7 +165,10 @@ static long plpar_int_get_source_info(unsigned long flags,
+@@ -164,7 +164,10 @@ static long plpar_int_get_source_info(unsigned long flags,
unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
long rc;
@@ -36,7 +38,7 @@ index 7113f5d87952..97ea0a67a173 100644
if (rc) {
pr_err("H_INT_GET_SOURCE_INFO lisn=%ld failed %ld\n", lisn, rc);
return rc;
-@@ -198,8 +201,11 @@ static long plpar_int_set_source_config(unsigned long flags,
+@@ -197,8 +200,11 @@ static long plpar_int_set_source_config(unsigned long flags,
flags, lisn, target, prio, sw_irq);
@@ -50,7 +52,7 @@ index 7113f5d87952..97ea0a67a173 100644
if (rc) {
pr_err("H_INT_SET_SOURCE_CONFIG lisn=%ld target=%lx prio=%lx failed %ld\n",
lisn, target, prio, rc);
-@@ -218,7 +224,11 @@ static long plpar_int_get_queue_info(unsigned long flags,
+@@ -217,7 +223,11 @@ static long plpar_int_get_queue_info(unsigned long flags,
unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
long rc;
@@ -63,7 +65,7 @@ index 7113f5d87952..97ea0a67a173 100644
if (rc) {
pr_err("H_INT_GET_QUEUE_INFO cpu=%ld prio=%ld failed %ld\n",
target, priority, rc);
-@@ -247,8 +257,11 @@ static long plpar_int_set_queue_config(unsigned long flags,
+@@ -246,8 +256,11 @@ static long plpar_int_set_queue_config(unsigned long flags,
pr_devel("H_INT_SET_QUEUE_CONFIG flags=%lx target=%lx priority=%lx qpage=%lx qsize=%lx\n",
flags, target, priority, qpage, qsize);
@@ -77,7 +79,7 @@ index 7113f5d87952..97ea0a67a173 100644
if (rc) {
pr_err("H_INT_SET_QUEUE_CONFIG cpu=%ld prio=%ld qpage=%lx returned %ld\n",
target, priority, qpage, rc);
-@@ -262,7 +275,10 @@ static long plpar_int_sync(unsigned long flags, unsigned long lisn)
+@@ -261,7 +274,10 @@ static long plpar_int_sync(unsigned long flags, unsigned long lisn)
{
long rc;
@@ -89,7 +91,7 @@ index 7113f5d87952..97ea0a67a173 100644
if (rc) {
pr_err("H_INT_SYNC lisn=%ld returned %ld\n", lisn, rc);
return rc;
-@@ -285,7 +301,11 @@ static long plpar_int_esb(unsigned long flags,
+@@ -284,7 +300,11 @@ static long plpar_int_esb(unsigned long flags,
pr_devel("H_INT_ESB flags=%lx lisn=%lx offset=%lx in=%lx\n",
flags, lisn, offset, in_data);
diff --git a/patches.arch/powerpc-xive-shutdown-XIVE-when-kexec-or-kdump-is-pe.patch b/patches.arch/powerpc-xive-shutdown-XIVE-when-kexec-or-kdump-is-pe.patch
index c3ad909fd1..e74bde6173 100644
--- a/patches.arch/powerpc-xive-shutdown-XIVE-when-kexec-or-kdump-is-pe.patch
+++ b/patches.arch/powerpc-xive-shutdown-XIVE-when-kexec-or-kdump-is-pe.patch
@@ -1,26 +1,28 @@
-From 07a48c282958ec44ad51d73f6fed31e2d2eb24ca Mon Sep 17 00:00:00 2001
+From 72224846fb1f066cc04dc0a38d910221b5719bdf Mon Sep 17 00:00:00 2001
From: Cédric Le Goater <clg@kaod.org>
-Date: Tue, 3 Apr 2018 09:15:47 +0200
-Subject: [PATCH 3/4] powerpc/xive: shutdown XIVE when kexec or kdump is
- performed
+Date: Tue, 8 May 2018 09:05:16 +0200
+Subject: [PATCH] powerpc/xive: shutdown XIVE when kexec or kdump is performed
References: bsc#1088273
-Patch-mainline: submitted https://patchwork.ozlabs.org/cover/894465/
+Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
+Patch-mainline: queued
+Git-commit: 72224846fb1f066cc04dc0a38d910221b5719bdf
The hcall H_INT_RESET should be called to make sure XIVE is fully
reseted.
Signed-off-by: Cédric Le Goater <clg@kaod.org>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Acked-by: Michal Suchanek <msuchanek@suse.de>
---
arch/powerpc/platforms/pseries/kexec.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/pseries/kexec.c b/arch/powerpc/platforms/pseries/kexec.c
-index eeb13429d685..1d9bbf8e7357 100644
+index 3fe126796975..46fbaef69a59 100644
--- a/arch/powerpc/platforms/pseries/kexec.c
+++ b/arch/powerpc/platforms/pseries/kexec.c
-@@ -52,8 +52,11 @@ void pseries_kexec_cpu_down(int crash_shutdown, int secondary)
+@@ -57,8 +57,11 @@ void pseries_kexec_cpu_down(int crash_shutdown, int secondary)
}
}
diff --git a/patches.kabi/0008-kabi-arm64-reserve-space-in-cpu_hwcaps-and-cpu_hwcap.patch b/patches.suse/0008-kabi-arm64-reserve-space-in-cpu_hwcaps-and-cpu_hwcap.patch
index 1b6e1e3e03..1b6e1e3e03 100644
--- a/patches.kabi/0008-kabi-arm64-reserve-space-in-cpu_hwcaps-and-cpu_hwcap.patch
+++ b/patches.suse/0008-kabi-arm64-reserve-space-in-cpu_hwcaps-and-cpu_hwcap.patch
diff --git a/patches.suse/reiserfs-mark-read-write-mode-unsupported.patch b/patches.suse/reiserfs-mark-read-write-mode-unsupported.patch
new file mode 100644
index 0000000000..39a56ae8cc
--- /dev/null
+++ b/patches.suse/reiserfs-mark-read-write-mode-unsupported.patch
@@ -0,0 +1,66 @@
+From: Jeff Mahoney <jeffm@suse.com>
+Subject: reiserfs: mark read-write mode unsupported
+References: FATE#323394
+Patch-mainline: Never, SUSE-specific
+
+SLE15 will not have reiserfs support but it is required to be able to
+identify and/or migrate existing file systems. This patch disabled
+read-write mode on supported systems.
+
+We return -EACCES and mount(8) will retry in read-only mode before
+issuing a message about the device being read-only.
+
+Signed-off-by: Jeff Mahoney <jeffm@suse.com>
+---
+ fs/reiserfs/super.c | 26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
+
+--- a/fs/reiserfs/super.c
++++ b/fs/reiserfs/super.c
+@@ -30,6 +30,26 @@
+ #include <linux/namei.h>
+ #include <linux/crc32.h>
+ #include <linux/seq_file.h>
++#include <linux/moduleparam.h>
++#include <linux/unsupported-feature.h>
++
++DECLARE_SUSE_UNSUPPORTED_FEATURE(reiserfs)
++DEFINE_SUSE_UNSUPPORTED_FEATURE(reiserfs)
++
++static bool check_rw_mount(struct super_block *sb, unsigned long flags)
++{
++ if (flags & MS_RDONLY)
++ return true;
++
++ if (reiserfs_allow_unsupported()) {
++ reiserfs_mark_unsupported();
++ return true;
++ }
++
++ pr_warn("reiserfs: read-write mode is unsupported.\n");
++ pr_warn("reiserfs: load module with allow_unsupported=1 to enable read-write mode.\n");
++ return false;
++}
+
+ struct file_system_type reiserfs_fs_type;
+
+@@ -1450,6 +1470,9 @@ static int reiserfs_remount(struct super
+ int i;
+ #endif
+
++ if (!check_rw_mount(s, *mount_flags))
++ return -EACCES;
++
+ new_opts = kstrdup(arg, GFP_KERNEL);
+ if (arg && !new_opts)
+ return -ENOMEM;
+@@ -1916,6 +1939,9 @@ static int reiserfs_fill_super(struct su
+ char *qf_names[REISERFS_MAXQUOTAS] = {};
+ unsigned int qfmt = 0;
+
++ if (!check_rw_mount(s, s->s_flags))
++ return -EACCES;
++
+ save_mount_options(s, data);
+
+ sbi = kzalloc(sizeof(struct reiserfs_sb_info), GFP_KERNEL);
diff --git a/patches.suse/unsupported-features.patch b/patches.suse/unsupported-features.patch
index 720e288a95..1f87145f15 100644
--- a/patches.suse/unsupported-features.patch
+++ b/patches.suse/unsupported-features.patch
@@ -9,14 +9,14 @@ we might use the same to make the messages more consistent.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
---
- include/linux/unsupported-feature.h | 40 ++++++++++++++++++++++++++++
+ include/linux/unsupported-feature.h | 48 ++++++++++++++++++++++++++
kernel/Makefile | 2 +
- kernel/unsupported-feature.c | 51 ++++++++++++++++++++++++++++++++++++
- 3 files changed, 93 insertions(+)
+ kernel/unsupported-feature.c | 65 ++++++++++++++++++++++++++++++++++++
+ 3 files changed, 115 insertions(+)
--- /dev/null
+++ b/include/linux/unsupported-feature.h
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,48 @@
+#ifndef _UNSUPPORTED_FEATURE_H_
+#define _UNSUPPORTED_FEATURE_H_
+
@@ -32,12 +32,19 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
+}
+
+extern struct kernel_param_ops suse_allow_unsupported_param_ops;
++void suse_mark_unsupported(const struct unsupported_feature *uf,
++ struct module *module);
+
+#define DECLARE_SUSE_UNSUPPORTED_FEATURE(name) \
+extern struct unsupported_feature name ##__allow_unsupported; \
+static inline bool name ## _allow_unsupported(void) \
+{ \
+ return suse_allow_unsupported(&name ##__allow_unsupported); \
++} \
++ \
++static inline void name ## _mark_unsupported(void) \
++{ \
++ suse_mark_unsupported(&name ##__allow_unsupported, THIS_MODULE); \
+}
+
+#define DEFINE_SUSE_UNSUPPORTED_FEATURE(name) \
@@ -52,7 +59,8 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
+
+#else
+#define DECLARE_SUSE_UNSUPPORTED_FEATURE(name) \
-+static inline bool name ## _allow_unsupported(void) { return true; }
++static inline bool name ## _allow_unsupported(void) { return true; } \
++static inline void name ## _mark_unsupported(void) { }
+#define DEFINE_SUSE_UNSUPPORTED_FEATURE(name)
+#endif
+
@@ -70,7 +78,7 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
targets += config_data.gz
--- /dev/null
+++ b/kernel/unsupported-feature.c
-@@ -0,0 +1,51 @@
+@@ -0,0 +1,65 @@
+#include <linux/kernel.h>
+#include <linux/moduleparam.h>
+#include <linux/unsupported-feature.h>
@@ -122,3 +130,17 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
+ .get = suse_get_allow_unsupported,
+};
+EXPORT_SYMBOL_GPL(suse_allow_unsupported_param_ops);
++
++/* including above breaks kABI due to struct module becoming defined */
++#include <linux/module.h>
++
++void suse_mark_unsupported(const struct unsupported_feature *uf,
++ struct module *module)
++{
++ if (module && !test_and_set_bit(TAINT_NO_SUPPORT, &module->taints))
++ pr_warn("%s: marking %s unsupported\n",
++ uf->subsys_name, module_name(module));
++}
++EXPORT_SYMBOL_GPL(suse_mark_unsupported);
++
++
diff --git a/rpm/package-descriptions b/rpm/package-descriptions
index 88affe8720..c7580b117c 100644
--- a/rpm/package-descriptions
+++ b/rpm/package-descriptions
@@ -159,3 +159,9 @@ reproduced, verified and corrected.
Selftest drivers are intended to be supported only in testing and QA
environments, they are not intended to be run on production systems.
+
+=== reiserfs-kmp ===
+Reiserfs kernel module
+
+The reiserfs file system is no longer supported in SLE15. This package
+provides the reiserfs module for the installation system.
diff --git a/series.conf b/series.conf
index 4c98fc0f4d..ba3bb1d47a 100644
--- a/series.conf
+++ b/series.conf
@@ -11774,6 +11774,12 @@
# jejb/scsi for-next
patches.drivers/scsi-lpfc-fix-wq-cq-creation-for-older-asic-s.patch
+ # powerpc/linux next
+ patches.arch/powerpc-64-kexec-fix-race-in-kexec-when-XIVE-is-shut.patch
+ patches.arch/powerpc-xive-fix-hcall-H_INT_RESET-to-support-long-b.patch
+ patches.arch/powerpc-xive-shutdown-XIVE-when-kexec-or-kdump-is-pe.patch
+ patches.arch/powerpc-xive-prepare-all-hcalls-to-support-long-busy.patch
+
# dhowells/linux-fs keys-uefi
patches.suse/0001-KEYS-Allow-unrestricted-boot-time-addition-of-keys-t.patch
patches.suse/0002-efi-Add-EFI-signature-data-types.patch
@@ -11831,10 +11837,6 @@
patches.suse/fw_cfg-add-DMA-register.patch
patches.suse/crash-export-paddr_vmcoreinfo_note.patch
patches.suse/fw_cfg-write-vmcoreinfo-details.patch
- patches.arch/powerpc-64-kexec-fix-race-in-kexec-when-XIVE-is-shut.patch
- patches.arch/powerpc-xive-fix-hcall-H_INT_RESET-to-support-long-b.patch
- patches.arch/powerpc-xive-shutdown-XIVE-when-kexec-or-kdump-is-pe.patch
- patches.arch/powerpc-xive-prepare-all-hcalls-to-support-long-busy.patch
patches.drivers/qla2xxx-Enable-T10-DIF-with-FC-NVMe-enabled.patch
patches.fixes/ext4-Fix-hole-length-detection-in-ext4_ind_map_block.patch
@@ -12112,7 +12114,7 @@
patches.drivers/0013-PCI-Remove-redundant-probes-for-device-reset-support.patch
########################################################
- # xfs/ext4/btrfs
+ # xfs/ext4/btrfs/reiserfs
########################################################
patches.drivers/pstore_disable_efi_backend_by_default.patch
patches.suse/pstore-backend-autoaction
@@ -12134,6 +12136,7 @@
patches.suse/btrfs-qgroups-fix-rescan-worker-running-races.patch
patches.suse/btrfs-suspend-qgroups-during-relocation-recovery.patch
patches.suse/0001-btrfs-Fix-wrong-first_key-parameter-in-replace_path.patch
+ patches.suse/reiserfs-mark-read-write-mode-unsupported.patch
########################################################
# NFS
@@ -12429,10 +12432,10 @@
patches.suse/0001-Add-a-void-suse_kabi_padding-placeholder-to-some-USB.patch
patches.suse/0002-Add-a-void-suse_kabi_padding-placeholder-to-some-gsp.patch
patches.suse/0001-Thunderbolt-kABI-paddings-added.patch
+ patches.suse/0008-kabi-arm64-reserve-space-in-cpu_hwcaps-and-cpu_hwcap.patch
patches.suse/prepare-arm64-kgraft
patches.kabi/kabi-IB-mlx5-Fix-integer-overflows-in-mlx5_ib_create_srq.patch
patches.kabi/musb-flush_irq_work-kabi-fix.patch
- patches.kabi/0008-kabi-arm64-reserve-space-in-cpu_hwcaps-and-cpu_hwcap.patch
patches.kabi/0003-md-fix-md_write_start-deadlock-w-o-metadata-devices.kabi
########################################################
diff --git a/supported.conf b/supported.conf
index c527e98446..3d9ede5d0a 100644
--- a/supported.conf
+++ b/supported.conf
@@ -2339,7 +2339,7 @@
fs/quota/quota_tree
fs/quota/quota_v1
fs/quota/quota_v2
-- fs/reiserfs/reiserfs # ReiserFS journaled filesystem
++reiserfs-kmp fs/reiserfs/reiserfs # ReiserFS journaled filesystem
fs/squashfs/squashfs
fs/squashfs3/squashfs3
fs/udf/udf # Universal Disk Format Filesystem