From ac4f7297a42854a1ef0a1bfd2d7dede7897eebf9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 10 Jan 2020 08:06:35 +0100 Subject: [PATCH] drop arm-shmobile-defconfig-restore-debugfs-support.patch --- ...le-defconfig-restore-debugfs-support.patch | 50 ------------------- queue-4.19/series | 1 - ...le-defconfig-restore-debugfs-support.patch | 49 ------------------ queue-5.4/series | 1 - 4 files changed, 101 deletions(-) delete mode 100644 queue-4.19/arm-shmobile-defconfig-restore-debugfs-support.patch delete mode 100644 queue-5.4/arm-shmobile-defconfig-restore-debugfs-support.patch diff --git a/queue-4.19/arm-shmobile-defconfig-restore-debugfs-support.patch b/queue-4.19/arm-shmobile-defconfig-restore-debugfs-support.patch deleted file mode 100644 index 8f737f7d77b..00000000000 --- a/queue-4.19/arm-shmobile-defconfig-restore-debugfs-support.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 623dfdf38b313d0a23d6e6628f1c336d89e8f191 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 9 Dec 2019 11:13:27 +0100 -Subject: ARM: shmobile: defconfig: Restore debugfs support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Geert Uytterhoeven - -[ Upstream commit fa2cdb1762d15f701b83efa60b04f0d04e71bf89 ] - -Since commit 0e4a459f56c32d3e ("tracing: Remove unnecessary DEBUG_FS -dependency"), CONFIG_DEBUG_FS is no longer auto-enabled. This breaks -booting Debian 9, as systemd needs debugfs: - - [FAILED] Failed to mount /sys/kernel/debug. - See 'systemctl status sys-kernel-debug.mount' for details. - [DEPEND] Dependency failed for Local File Systems. - ... - You are in emergGive root password for maintenance - (or press Control-D to continue): - -Fix this by enabling CONFIG_DEBUG_FS explicitly. - -See also commit 18977008f44c66bd ("ARM: multi_v7_defconfig: Restore -debugfs support"). - -Signed-off-by: Geert Uytterhoeven -Reviewed-by: Niklas Söderlund -Link: https://lore.kernel.org/r/20191209101327.26571-1-geert+renesas@glider.be -Signed-off-by: Sasha Levin ---- - arch/arm/configs/shmobile_defconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig -index f8faf3729464..a0e487e95d69 100644 ---- a/arch/arm/configs/shmobile_defconfig -+++ b/arch/arm/configs/shmobile_defconfig -@@ -211,5 +211,6 @@ CONFIG_NLS_ISO8859_1=y - CONFIG_PRINTK_TIME=y - # CONFIG_ENABLE_WARN_DEPRECATED is not set - # CONFIG_ENABLE_MUST_CHECK is not set -+CONFIG_DEBUG_FS=y - CONFIG_DEBUG_KERNEL=y - # CONFIG_ARM_UNWIND is not set --- -2.20.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 4df8adf48ad..5f9cea189fa 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -32,7 +32,6 @@ samples-bpf-replace-symbol-compare-of-trace_event.patch samples-bpf-fix-syscall_tp-due-to-unused-syscall.patch powerpc-ensure-that-swiotlb-buffer-is-allocated-from.patch btrfs-fix-error-messages-in-qgroup_rescan_init.patch -arm-shmobile-defconfig-restore-debugfs-support.patch bpf-clear-skb-tstamp-in-bpf_redirect-when-necessary.patch bnx2x-do-not-handle-requests-from-vfs-after-parity.patch bnx2x-fix-logic-to-get-total-no.-of-pfs-per-engine.patch diff --git a/queue-5.4/arm-shmobile-defconfig-restore-debugfs-support.patch b/queue-5.4/arm-shmobile-defconfig-restore-debugfs-support.patch deleted file mode 100644 index 66762e9ebbe..00000000000 --- a/queue-5.4/arm-shmobile-defconfig-restore-debugfs-support.patch +++ /dev/null @@ -1,49 +0,0 @@ -From b56e3b1467eba2ba55bca05e3c8697b23304f12b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 9 Dec 2019 11:13:27 +0100 -Subject: ARM: shmobile: defconfig: Restore debugfs support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Geert Uytterhoeven - -[ Upstream commit fa2cdb1762d15f701b83efa60b04f0d04e71bf89 ] - -Since commit 0e4a459f56c32d3e ("tracing: Remove unnecessary DEBUG_FS -dependency"), CONFIG_DEBUG_FS is no longer auto-enabled. This breaks -booting Debian 9, as systemd needs debugfs: - - [FAILED] Failed to mount /sys/kernel/debug. - See 'systemctl status sys-kernel-debug.mount' for details. - [DEPEND] Dependency failed for Local File Systems. - ... - You are in emergGive root password for maintenance - (or press Control-D to continue): - -Fix this by enabling CONFIG_DEBUG_FS explicitly. - -See also commit 18977008f44c66bd ("ARM: multi_v7_defconfig: Restore -debugfs support"). - -Signed-off-by: Geert Uytterhoeven -Reviewed-by: Niklas Söderlund -Link: https://lore.kernel.org/r/20191209101327.26571-1-geert+renesas@glider.be -Signed-off-by: Sasha Levin ---- - arch/arm/configs/shmobile_defconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig -index c6c70355141c..7e7b678ae153 100644 ---- a/arch/arm/configs/shmobile_defconfig -+++ b/arch/arm/configs/shmobile_defconfig -@@ -215,4 +215,5 @@ CONFIG_DMA_CMA=y - CONFIG_CMA_SIZE_MBYTES=64 - CONFIG_PRINTK_TIME=y - # CONFIG_ENABLE_MUST_CHECK is not set -+CONFIG_DEBUG_FS=y - CONFIG_DEBUG_KERNEL=y --- -2.20.1 - diff --git a/queue-5.4/series b/queue-5.4/series index d93dfafa868..12d4d2ef581 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -72,7 +72,6 @@ pinctrl-pinmux-fix-a-possible-null-pointer-in-pinmux.patch powerpc-ensure-that-swiotlb-buffer-is-allocated-from.patch btrfs-fix-error-messages-in-qgroup_rescan_init.patch btrfs-fix-cloning-range-with-a-hole-when-using-the-n.patch -arm-shmobile-defconfig-restore-debugfs-support.patch btrfs-handle-error-in-btrfs_cache_block_group.patch btrfs-fix-hole-extent-items-with-a-zero-size-after-r.patch ocxl-fix-potential-memory-leak-on-context-creation.patch -- 2.47.3