summaryrefslogtreecommitdiffstats
path: root/patch-6.2-redhat.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patch-6.2-redhat.patch')
-rw-r--r--patch-6.2-redhat.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch
index bf29c9896..8f14182f4 100644
--- a/patch-6.2-redhat.patch
+++ b/patch-6.2-redhat.patch
@@ -121,7 +121,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
-index 25247f931872..f72f0ed52e78 100644
+index d4b6af8c09e9..8223bfdea30b 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -1229,7 +1229,7 @@ index ee4da9ab8013..d395d11eadc4 100644
if (ret < 0)
goto err_allowedips;
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index 95c488ea91c3..fad3f16d463f 100644
+index 7be562a4e1aa..0169d9f5df9b 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -250,6 +250,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@@ -1343,7 +1343,7 @@ index c03093b6813c..46a71df1fbd1 100644
if (!ctrl->max_namespaces ||
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
-index 6bbb73ef8b25..1c99a8a525c9 100644
+index 424c8a467a0c..3230b91d3476 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -873,6 +873,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys);
@@ -2547,7 +2547,7 @@ index 7e5c3ddc341d..850393c608ef 100644
default y
help
diff --git a/kernel/Makefile b/kernel/Makefile
-index e7fc37a68069..b91424eebd96 100644
+index 10ef068f598d..d7953f0ee28a 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -12,6 +12,7 @@ obj-y = fork.o exec_domain.o panic.o \
@@ -2650,10 +2650,10 @@ index a2ff4242e623..f0d2be1ee4f1 100644
int module_sig_check(struct load_info *info, int flags)
diff --git a/kernel/panic.c b/kernel/panic.c
-index 326d91505f04..44b01e472228 100644
+index 463c9295bc28..9f4d0cefeceb 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
-@@ -467,6 +467,19 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = {
+@@ -470,6 +470,19 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = {
[ TAINT_AUX ] = { 'X', ' ', true },
[ TAINT_RANDSTRUCT ] = { 'T', ' ', true },
[ TAINT_TEST ] = { 'N', ' ', true },