summaryrefslogtreecommitdiffstats
path: root/patch-5.17-redhat.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patch-5.17-redhat.patch')
-rw-r--r--patch-5.17-redhat.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch
index 1c91ae821..c7be88cf8 100644
--- a/patch-5.17-redhat.patch
+++ b/patch-5.17-redhat.patch
@@ -131,7 +131,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
-index ceb987e5c87b..b4e3cf779718 100644
+index 51e142f760f7..3abb272fb795 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -177,10 +177,10 @@ index 4c97cb40eebb..caf06cef3d2e 100644
The VM uses one page of physical memory for each page table.
For systems with a lot of processes, this can use a lot of
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index cbcd42decb2a..a2920cce2695 100644
+index 09b885cc4db5..73fd512bd66f 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
-@@ -1108,7 +1108,7 @@ endchoice
+@@ -1109,7 +1109,7 @@ endchoice
config ARM64_FORCE_52BIT
bool "Force 52-bit virtual addresses for userspace"
@@ -189,7 +189,7 @@ index cbcd42decb2a..a2920cce2695 100644
help
For systems with 52-bit userspace VAs enabled, the kernel will attempt
to maintain compatibility with older software by providing 48-bit VAs
-@@ -1350,6 +1350,7 @@ config XEN
+@@ -1351,6 +1351,7 @@ config XEN
config FORCE_MAX_ZONEORDER
int
default "14" if ARM64_64K_PAGES
@@ -1553,7 +1553,7 @@ index ee4da9ab8013..0f217997a764 100644
err_netlink:
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index 961a5f8a44d2..3b125b6a5eeb 100644
+index 79005ea1a33e..355445ee7956 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -244,6 +244,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)