FAILED: patch "[PATCH] ARC: [plat-axs*]: Enable SWAP" failed to apply to 4.18-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 4.18-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
c83532fb0fe053d2e43e9387354cb1b52ba26427Mon Sep 17 00:00:00 2001
From: Alexey Brodkin <[email protected]>
Date: Thu, 2 Aug 2018 11:50:16 +0300
Subject: [PATCH] ARC: [plat-axs*]: Enable SWAP
SWAP support on ARC was fixed earlier by
commit 6e3761145a9b ("ARC: Fix CONFIG_SWAP")
so now we may safely enable it on platforms that
have external media like USB and SD-card.
Note: it was already allowed for HSDK
arch/arc/configs/axs101_defconfig +0 -1
@@ -1,4 +1,3 @@ -# CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y # CONFIG_CROSS_MEMORY_ATTACH is not set
arch/arc/configs/axs103_defconfig +0 -1
@@ -1,4 +1,3 @@ -# CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y # CONFIG_CROSS_MEMORY_ATTACH is not set
arch/arc/configs/axs103_smp_defconfig +0 -1
@@ -1,4 +1,3 @@ -# CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y # CONFIG_CROSS_MEMORY_ATTACH is not set
Hi Greg,
Quoted 8 lines · On Sun, 2018-09-16 at 14:33 +0200, [email protected] wrote:
The patch below does not apply to the 4.18-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.thanks,
greg k-h
The reason for conflict is
commit 4051c323c59b ("ARC: configs: cleanup") which removes the first line of defconfigs which is a part of this patch context.
Below is updated patch for pre 4.19 kernels (note it applies to 4.9, 4.14 and 4.18):
-----------------------------------------------------
From 13786ec21570dd8ba7264e542eb4749a2f7a4f93 Mon Sep 17 00:00:00 2001
From: Alexey Brodkin <[email protected]>
Date: Thu, 2 Aug 2018 11:50:16 +0300
Subject: [PATCH] ARC: [plat-axs*]: Enable SWAP
SWAP support on ARC was fixed earlier by
commit 6e3761145a9b ("ARC: Fix CONFIG_SWAP")
so now we may safely enable it on platforms that
have external media like USB and SD-card.
Note: it was already allowed for HSDK
--- arch/arc/configs/axs101_defconfig | 1 - arch/arc/configs/axs103_defconfig | 1 - arch/arc/configs/axs103_smp_defconfig | 1 - 3 files changed, 3 deletions(-)
arch/arc/configs/axs101_defconfig +0 -1
@@ -1,5 +1,4 @@ CONFIG_DEFAULT_HOSTNAME="ARCLinux" -# CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y # CONFIG_CROSS_MEMORY_ATTACH is not set
arch/arc/configs/axs103_defconfig +0 -1
@@ -1,5 +1,4 @@ CONFIG_DEFAULT_HOSTNAME="ARCLinux" -# CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y # CONFIG_CROSS_MEMORY_ATTACH is not set
arch/arc/configs/axs103_smp_defconfig +0 -1
@@ -1,5 +1,4 @@ CONFIG_DEFAULT_HOSTNAME="ARCLinux" -# CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y # CONFIG_CROSS_MEMORY_ATTACH is not set
Signature · 1 line
2.17.1
[email protected]
maintainerQuoted 10 lines · Alexey Brodkin
Hi Greg,
Quoted 7 lines · On Sun, 2018-09-16 at 14:33 +0200, [email protected] wrote:
The patch below does not apply to the 4.18-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.thanks,
Quoted 8 lines
Quoted 1 line
greg k-h
The reason for conflict is
commit4051c323c59b("ARC: configs: cleanup") which removes the first line of defconfigs which is a part of this patch context.Below is updated patch for pre 4.19 kernels (note it applies to 4.9, 4.14 and 4.18):
-----------------------------------------------------
Thanks, now applied.
greg k-h