From patchwork Tue Jul 12 12:04:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Renner Berthing X-Patchwork-Id: 1655354 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=l7pCE4BJ; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lhzwg26dzz9sB4 for ; Tue, 12 Jul 2022 22:05:39 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1oBEdv-0004K0-B0; Tue, 12 Jul 2022 12:05:31 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oBEdQ-0003ax-Hy for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 12:05:00 +0000 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 430DE3FC18 for ; Tue, 12 Jul 2022 12:05:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657627500; bh=rICm5CbeYxkSgpRv0VK6nwPf5Dn1ovForKoMCCD+n7M=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=l7pCE4BJEtkqgSeKpbHsG2y74U18Iqt5m+CE+VoQVrr3aaszoocs92tOT8ck1ysvx 3l3STL/ZAzoKYztkeGLloG2mkX1J5U6rbbw9Usj98XmrdPffLAaiKvVEkcU1kWNCWW 8SIZ9AZxYW5dfmsSJ6iTg8SbWUBbqjYkwAGUyYdxdj1heGzB55YRx8xlvEXxcX9AgC 4WbYr9828omPvv/r36jzjq0TF0mB/Na0sxmUFNp6pDlgfpGcXturRWwD9H7fVpR7aW SboD4zjuBNHCuetrywOGe+sFbR7zBQ39R1CLd3lb4sGlRB+N8QR67J8LP2wVwuq0UD tAjuJXHSBAUpQ== Received: by mail-wm1-f71.google.com with SMTP id a6-20020a05600c348600b003a2d72b7a15so6628797wmq.9 for ; Tue, 12 Jul 2022 05:05:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rICm5CbeYxkSgpRv0VK6nwPf5Dn1ovForKoMCCD+n7M=; b=MwAYaK4h0zYrvP2ZE2L7bRnoQUjC6dXRvZ0m0oUGzpvvItLHZnVb/PHDazkO8WboFC QCVqQhjQpQ66YFYNWgpYb3F3FvoW9B/qBPF8z3EKKr1zTgLjgIu/m88zSWy4vpJjdl9+ BWCGGur8zSoOaBFwhGSgXdLin4V+Ej+7TiL1dDVtasW7kkXRY10FP7KuBCgQtsfSLPps HrHa5ZqaMC6sqculXtnz3OvFW0s4k9RD52SY9DcfSx/IqmGYgFzKSe/85w12zgmwiESA V1mz4LfIyeOQ7Nm1yLkq8tbnuEjgcxX9q+h4ICh7oUAv37gdvg2e7wy6lg5ZpenM7XNN mwhw== X-Gm-Message-State: AJIora9ZOR9xs8/BFti5A2s97G+rmSmnvNq87DBKxQW6HySRCveim1Wf jlvaoCUSi8tSbG90jQOfmcz2dxsVPHB/tev9gDZFYENMfIeAXm8Edd7xaJN2DlQjk18iQqP32q0 oF5ud/kLMLLf1Q5TeifQ4uUSvRn/15uGICcLHQM021g== X-Received: by 2002:a05:6000:1847:b0:21b:eda7:e0fc with SMTP id c7-20020a056000184700b0021beda7e0fcmr20857880wri.664.1657627499668; Tue, 12 Jul 2022 05:04:59 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ttLvflpklGuenAJRMhvKIvPNAAc7MsfYsa67Itpi5VAqv0UnGpcfRz9M8JR9Ys61ZWtCaFUw== X-Received: by 2002:a05:6000:1847:b0:21b:eda7:e0fc with SMTP id c7-20020a056000184700b0021beda7e0fcmr20857851wri.664.1657627499283; Tue, 12 Jul 2022 05:04:59 -0700 (PDT) Received: from stitch.. (80.71.140.73.ipv4.parknet.dk. [80.71.140.73]) by smtp.gmail.com with ESMTPSA id i15-20020adfefcf000000b0021d82a6095bsm7992246wrp.95.2022.07.12.05.04.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 05:04:58 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 13/16] UBUNTU: [Config] Enable CONFIG_PROC_VMCORE_DEVICE_DUMP on riscv64 Date: Tue, 12 Jul 2022 14:04:44 +0200 Message-Id: <20220712120447.355124-14-emil.renner.berthing@canonical.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220712120447.355124-1-emil.renner.berthing@canonical.com> References: <20220712120447.355124-1-emil.renner.berthing@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1981437 This option was not annotated in the linux-riscv tree, so let's align it with the other architectures. Signed-off-by: Emil Renner Berthing --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/annotations | 2 +- debian.master/config/arm64/config.common.arm64 | 1 - debian.master/config/armhf/config.common.armhf | 1 - debian.master/config/config.common.ubuntu | 1 + debian.master/config/ppc64el/config.common.ppc64el | 1 - debian.master/config/riscv64/config.common.riscv64 | 1 - debian.master/config/s390x/config.common.s390x | 1 - 8 files changed, 2 insertions(+), 7 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index f69263f91b38..fe2f97f269e3 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -509,7 +509,6 @@ CONFIG_PPS_CLIENT_GPIO=m CONFIG_PPS_CLIENT_LDISC=m # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y -CONFIG_PROC_VMCORE_DEVICE_DUMP=y # CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSTORE=y # CONFIG_PSTORE_CONSOLE is not set diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 59638108f3cf..328af633d8a7 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -11031,7 +11031,7 @@ CONFIG_EFIVAR_FS note CONFIG_PROC_KCORE policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_PROC_VMCORE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> -CONFIG_PROC_VMCORE_DEVICE_DUMP policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'n', 's390x': 'y'}> +CONFIG_PROC_VMCORE_DEVICE_DUMP policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_PROC_SYSCTL policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_PROC_PAGE_MONITOR policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 087599bee316..7b04b130ce6a 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -531,7 +531,6 @@ CONFIG_PPS_CLIENT_GPIO=m CONFIG_PPS_CLIENT_LDISC=m # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y -CONFIG_PROC_VMCORE_DEVICE_DUMP=y # CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSTORE=y # CONFIG_PSTORE_CONSOLE is not set diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 10000c988072..92b2cac23531 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -515,7 +515,6 @@ CONFIG_PPS_CLIENT_GPIO=m CONFIG_PPS_CLIENT_LDISC=m # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y -CONFIG_PROC_VMCORE_DEVICE_DUMP=y # CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSTORE=y CONFIG_PSTORE_CONSOLE=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 8bb74f870e45..d21e40243221 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -8574,6 +8574,7 @@ CONFIG_PROC_PID_CPUSET=y CONFIG_PROC_SYSCTL=y CONFIG_PROC_THERMAL_MMIO_RAPL=m CONFIG_PROC_VMCORE=y +CONFIG_PROC_VMCORE_DEVICE_DUMP=y # CONFIG_PROFILE_ALL_BRANCHES is not set # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_PROFILING=y diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index a0588eee4521..2c41e161b8e7 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -516,7 +516,6 @@ CONFIG_PPS_CLIENT_GPIO=m CONFIG_PPS_CLIENT_LDISC=m # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y -CONFIG_PROC_VMCORE_DEVICE_DUMP=y # CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSTORE=y # CONFIG_PSTORE_CONSOLE is not set diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index 2c9d903b4bcd..8c01ca4f83bd 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -507,7 +507,6 @@ CONFIG_PPS_CLIENT_GPIO=m CONFIG_PPS_CLIENT_LDISC=m # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y -# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set # CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSTORE=y # CONFIG_PSTORE_CONSOLE is not set diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index 26a95e6adbb1..2a2fcf69a943 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -464,7 +464,6 @@ CONFIG_PGTABLE_LEVELS=5 # CONFIG_PPS_CLIENT_LDISC is not set CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set -CONFIG_PROC_VMCORE_DEVICE_DUMP=y CONFIG_PSI_DEFAULT_DISABLED=y # CONFIG_PSTORE is not set CONFIG_PTDUMP_DEBUGFS=y