From patchwork Tue Jul 12 12:04:32 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: 1655343 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=plcC59ic; 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 4Lhzw60MCZz9sFk for ; Tue, 12 Jul 2022 22:05:08 +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 1oBEdK-0003UT-Um; Tue, 12 Jul 2022 12:04:54 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oBEdH-0003Qy-PF for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 12:04:51 +0000 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (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-1.canonical.com (Postfix) with ESMTPS id F0ED43F4D0 for ; Tue, 12 Jul 2022 12:04:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657627490; bh=l5uxkq5sMp5o0mqstsGRhSNIEGap+EYUvdpdnXyPGJw=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=plcC59icsRik5UnDFHHCvaMduvpZL557UNSJNbGy+pALMCFz53XZrTZUb+haiuuDL E8OMIsv3mvU1rEeFhYznouvFlFS05JWW757rvPOr1TeU8ECm3lAPB/pHGNkia6qcHr 5cFCU35FYZNWU1N/jTOOq71TUfeDJI4ornE9z5NmTD+F124j5hAwnoxvyD49HHt7dz duSRr55Bsx9kU8cYwpyNUq7SA5UACsUyot1gPZBxIOysdqmFkK08ix0Za750CyzlYR nsrsD1zL7RDGbN4otGjw+ZvwG9x6Z2rWxmWj+Nkfdg3tVINgtte80G6r6yCJ9/K705 jXD0BaWOeLXjQ== Received: by mail-wm1-f72.google.com with SMTP id i184-20020a1c3bc1000000b003a026f48333so4048498wma.4 for ; Tue, 12 Jul 2022 05:04:50 -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=l5uxkq5sMp5o0mqstsGRhSNIEGap+EYUvdpdnXyPGJw=; b=cq/LfxdVhqyX5tgziGGNzdzpmR6BB1DZTBECkwXPQaOPbN1qHjH8L+BZV/fYvLNvNn pdm0VxzpdDGh+diNebds7zeFZiiNg2G5eqU89U2DjLG2W1Qn/kiJOefMraB5bf8d2bLT av1OcMOnxyGoZyPc5n5FGtK3sRdsdV7DSW7IXHqpHKxBlX/35VR3vSDzCG6/BCGP6wvM iJrv1kPLF9QvT7VLFV3xPF/85g8nyQzyEOee49y9rlpg1hya0deo3+ZLGK6jcmYhiQh8 8qLnNrg/Nj3+iGLW1P3ETZGzZaePJVkiC5O9qsr5f/d2UfAGljMNAWxQoHAFUGyE3a6a 4WOw== X-Gm-Message-State: AJIora9aVtMnyMpCu+aeK/FYa6wHaxfWVHnDr7a46XSAENvRctbVGc8S mz6P+cfI1Ezj+BXeUD+9uuY1vsytsXq2YD6VG9IFzF0i1j2FlUlMgLphjyhdRV8IqFPKIhsN1tB tgjMFW+l/Z9/K3kClOUUMIbQMdgxn605BaMmGhHPPlw== X-Received: by 2002:adf:e30c:0:b0:21d:666f:f7bf with SMTP id b12-20020adfe30c000000b0021d666ff7bfmr20903542wrj.120.1657627489916; Tue, 12 Jul 2022 05:04:49 -0700 (PDT) X-Google-Smtp-Source: AGRyM1v5kSrglK1lQGjyrEClSsQwTBk2xc6UcJvisPGCgMPfArihO0NGEn9ghaUdF4vToxptPCRpWQ== X-Received: by 2002:adf:e30c:0:b0:21d:666f:f7bf with SMTP id b12-20020adfe30c000000b0021d666ff7bfmr20903512wrj.120.1657627489554; Tue, 12 Jul 2022 05:04:49 -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.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 05:04:49 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 01/16] UBUNTU: [Config] Disable CONFIG_CXL_MEM_RAW_COMMANDS on riscv64 Date: Tue, 12 Jul 2022 14:04:32 +0200 Message-Id: <20220712120447.355124-2-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 - 7 files changed, 2 insertions(+), 6 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 73abfdd0a295..c3fd7a196871 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -83,7 +83,6 @@ CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11 CONFIG_CRYPTO_SM3_GENERIC=m CONFIG_CRYPTO_SM4_GENERIC=m CONFIG_CXL_BUS=m -# CONFIG_CXL_MEM_RAW_COMMANDS is not set CONFIG_DEBUG_INFO_BTF=y CONFIG_DECNET=m CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 00683d2efa9e..f2d8dacaa3bd 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -696,7 +696,7 @@ CONFIG_MHI_BUS_PCI_GENERIC policy<{'amd64': 'm', 'arm64': ' # Menu: Device Drivers >> CXL (Compute Express Link) Devices Support CONFIG_CXL_BUS policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'n'}> CONFIG_CXL_MEM policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> -CONFIG_CXL_MEM_RAW_COMMANDS policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'y', 's390x': '-'}> +CONFIG_CXL_MEM_RAW_COMMANDS policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': '-'}> CONFIG_CXL_ACPI policy<{'amd64': 'm', 'arm64': 'm'}> CONFIG_CXL_PMEM policy<{'amd64': 'm', 'arm64': 'm', 'armhf-generic-lpae': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index ae43a5b2e7c4..e03083af3dc3 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -89,7 +89,6 @@ CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9 CONFIG_CRYPTO_SM3_GENERIC=m CONFIG_CRYPTO_SM4_GENERIC=m CONFIG_CXL_BUS=m -# CONFIG_CXL_MEM_RAW_COMMANDS is not set CONFIG_DEBUG_INFO_BTF=y CONFIG_DECNET=m CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index be6fe67009b8..6a146143fc34 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -81,7 +81,6 @@ CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9 CONFIG_CRYPTO_SM3_GENERIC=m CONFIG_CRYPTO_SM4_GENERIC=m CONFIG_CXL_BUS=m -# CONFIG_CXL_MEM_RAW_COMMANDS is not set # CONFIG_DEBUG_INFO_BTF is not set CONFIG_DECNET=m CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index ff7b6fa6d27d..ab2ad1f3bc4b 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2635,6 +2635,7 @@ CONFIG_CXLFLASH=m CONFIG_CXL_ACPI=m CONFIG_CXL_BASE=y CONFIG_CXL_MEM=m +# CONFIG_CXL_MEM_RAW_COMMANDS is not set CONFIG_CXL_PCI=m CONFIG_CXL_PMEM=m CONFIG_CXL_PORT=m diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index cc98a0a6930a..eb4b93eb7026 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -83,7 +83,6 @@ CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1 CONFIG_CRYPTO_SM3_GENERIC=m CONFIG_CRYPTO_SM4_GENERIC=m CONFIG_CXL_BUS=m -# CONFIG_CXL_MEM_RAW_COMMANDS is not set CONFIG_DEBUG_INFO_BTF=y CONFIG_DECNET=m CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index 8ed1cff72616..261dbb049839 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -79,7 +79,6 @@ CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1 CONFIG_CRYPTO_SM3_GENERIC=m CONFIG_CRYPTO_SM4_GENERIC=m CONFIG_CXL_BUS=m -CONFIG_CXL_MEM_RAW_COMMANDS=y CONFIG_DEBUG_INFO_BTF=y CONFIG_DECNET=m CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 From patchwork Tue Jul 12 12:04:33 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: 1655344 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=jiqchjMh; 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 4Lhzw608Tvz9sB4 for ; Tue, 12 Jul 2022 22:05:08 +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 1oBEdR-0003bX-CI; Tue, 12 Jul 2022 12:05:01 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oBEdI-0003Rc-MQ for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 12:04:52 +0000 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (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-1.canonical.com (Postfix) with ESMTPS id C9D0B3F4D0 for ; Tue, 12 Jul 2022 12:04:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657627491; bh=huRdNGy4Ph8zW9wCdxqmF16xdaubN8w3j/Nov4NhlTo=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jiqchjMhJa29+30KYW1PaokR7Os2323TTmNKT0DoMyKi/99UFxFRBcT4m4+WF7N5o 4HfJesm2v0JHrWr4YQqm8Y2X/XRbwMmgIZWxQQG9JWCRWnea9KG0mzq+VNPno4x09l hmmvENHXUF9Q6rL0nNLCp2cRHIV9OdQz/8zYV06qgtj25dc+CVkRMcnmCSSU1wgyur AZ+MA9H8sELMQcQbOvDxkeF7Du6m4mPfyyPthTH98oqUJqu2VnXEbmuwoqxzeDh6Ec T7wPmKZEfBbH0NZkRxWiQb/PSZODWIRc+d7qZTpXlRfNoSGX4VrNdaZQKYcG7koZ8m hVlXUghQEWlRw== Received: by mail-wm1-f69.google.com with SMTP id q15-20020a05600c040f00b003a2e5c8fca3so3429752wmb.7 for ; Tue, 12 Jul 2022 05:04:51 -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=huRdNGy4Ph8zW9wCdxqmF16xdaubN8w3j/Nov4NhlTo=; b=axdTKlorJG5a99xT2NEc5I3PkBbd8fzmwtJxUTaCzBULqzKPAXPh9eVKW1iW3UX8wu LgMiFQDf7ho0+PtIaza2OiiDJ7o5qwpRfTmMGuptkbyQX/Nw2dATc4W5WLwFN+Gwi+vo 3wWekT27b8lMHlcEJLSgTWKkWHAxmqNRzhpu+4mFneeeeWh96SsKfg+X3m5ZITtyRDRG XAITgV5iZAasLLXFrMaRjFhGrTCh0H6xva+zsT6uKjmXk4tRP0gsF6seaEFeTZX0pN/J 7DOpF7tkVQPRoG8c37UKsTHxpH4u6JdrtDFg5fxi7JIJkdRQ3Lsd37R1tL6cSDGVWKxI SIUg== X-Gm-Message-State: AJIora/Iehbe3V1u0sM17sdgd1qaIkQNOVdDWXHNvaTsAmyalFktumez NO6O4yZO2SJh464Le0gwZnrSkiG7DfLBwMGnxIrEOkpK+bykQczLQb7np9zURkEqyFwsnEi3XQq aCcqJzrnrmRYirgksTaGpcHtAOqS42zt5amnsJ2gBKg== X-Received: by 2002:a5d:4c49:0:b0:21d:6df5:beb7 with SMTP id n9-20020a5d4c49000000b0021d6df5beb7mr21895952wrt.286.1657627490790; Tue, 12 Jul 2022 05:04:50 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sa2Loo9COpEswytqeqOJBQXuGgSh2L2tCtPJVWcVdg9yhep7Ip+PoC8iCEKqACCXKwEFMAGw== X-Received: by 2002:a5d:4c49:0:b0:21d:6df5:beb7 with SMTP id n9-20020a5d4c49000000b0021d6df5beb7mr21895914wrt.286.1657627490344; Tue, 12 Jul 2022 05:04:50 -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.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 05:04:50 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 02/16] UBUNTU: [Config] Disable CONFIG_EROFS_FS_ZIP_LZMA on riscv64 Date: Tue, 12 Jul 2022 14:04:33 +0200 Message-Id: <20220712120447.355124-3-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/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 - 7 files changed, 1 insertion(+), 6 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index c3fd7a196871..4e71ee8464e0 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -124,7 +124,6 @@ CONFIG_EEPROM_MAX6875=m CONFIG_EFIVAR_FS=y CONFIG_EFS_FS=m CONFIG_ENCLOSURE_SERVICES=m -# CONFIG_EROFS_FS_ZIP_LZMA is not set CONFIG_ETHOC=m # CONFIG_EVM_LOAD_X509 is not set CONFIG_EXFAT_FS=m diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index e03083af3dc3..4649e94119bd 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -135,7 +135,6 @@ CONFIG_EEPROM_MAX6875=m CONFIG_EFIVAR_FS=y CONFIG_EFS_FS=m CONFIG_ENCLOSURE_SERVICES=m -# CONFIG_EROFS_FS_ZIP_LZMA is not set CONFIG_ETHOC=m # CONFIG_EVM_LOAD_X509 is not set CONFIG_EXFAT_FS=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 6a146143fc34..09da64415cb7 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -127,7 +127,6 @@ CONFIG_EEPROM_MAX6875=m CONFIG_EFIVAR_FS=y CONFIG_EFS_FS=m CONFIG_ENCLOSURE_SERVICES=m -# CONFIG_EROFS_FS_ZIP_LZMA is not set CONFIG_ETHOC=m # CONFIG_EVM_LOAD_X509 is not set CONFIG_EXFAT_FS=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index ab2ad1f3bc4b..c2855fa0d319 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3580,6 +3580,7 @@ CONFIG_EROFS_FS_POSIX_ACL=y CONFIG_EROFS_FS_SECURITY=y CONFIG_EROFS_FS_XATTR=y CONFIG_EROFS_FS_ZIP=y +# CONFIG_EROFS_FS_ZIP_LZMA is not set CONFIG_ERRATA_SIFIVE=y CONFIG_ERRATA_SIFIVE_CIP_1200=y CONFIG_ERRATA_SIFIVE_CIP_453=y diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index eb4b93eb7026..2e30608710e0 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -126,7 +126,6 @@ CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m CONFIG_EFS_FS=m CONFIG_ENCLOSURE_SERVICES=m -# CONFIG_EROFS_FS_ZIP_LZMA is not set CONFIG_ETHOC=m CONFIG_EVM_LOAD_X509=y CONFIG_EXFAT_FS=m diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index 261dbb049839..15424da6ab39 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -125,7 +125,6 @@ CONFIG_EEPROM_MAX6875=m CONFIG_EFIVAR_FS=m CONFIG_EFS_FS=m CONFIG_ENCLOSURE_SERVICES=m -CONFIG_EROFS_FS_ZIP_LZMA=y CONFIG_ETHOC=m # CONFIG_EVM_LOAD_X509 is not set CONFIG_EXFAT_FS=m diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index 242030babd09..cb977fc5bc42 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -109,7 +109,6 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m # CONFIG_EEPROM_MAX6875 is not set # CONFIG_EFS_FS is not set # CONFIG_ENCLOSURE_SERVICES is not set -# CONFIG_EROFS_FS_ZIP_LZMA is not set # CONFIG_ETHOC is not set # CONFIG_EVM_LOAD_X509 is not set # CONFIG_EXFAT_FS is not set From patchwork Tue Jul 12 12:04:34 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: 1655341 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=su/OwHLC; 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 4Lhzw61vD2z9sFs for ; Tue, 12 Jul 2022 22:05:09 +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 1oBEdS-0003cU-5a; Tue, 12 Jul 2022 12:05:02 +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 1oBEdI-0003Rh-Ou for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 12:04:52 +0000 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.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 5FAEE40004 for ; Tue, 12 Jul 2022 12:04:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657627492; bh=IEBolIoZw/XohkFMPFGPhPl3/8YtO9CROqa/m7AZics=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=su/OwHLCOfG4AdNODqMc/GXTMuWURwKQrfzVDDprtQXq5eLk+g6MJl+UkHD5IfyTO BXtGMrXerivw8jkLDtndHtYDGIsvHBAqpUiPaebhuC6s3+uhkjlOFC3DDv3XyeUG+R GCh5ulq2BkQbJKSAjxrfFyNDUCdbeh+qbefzD+t0v8YSoZP9OoX/aefuIsggS2s0Pg iAVzHVMdQxcnmMHZ+CX7kowTq7kgCY4LgOyNN6xsUTKtx38Xfyc2iIn8l2WNXOFsim ALRkvcicW2RXhrNh+MY4VcGblgg0AOldqBNcqWGz9bQ2UuE9MOdu5FGnGOmBO7uaO7 ANmeO35i1nESw== Received: by mail-wr1-f71.google.com with SMTP id m7-20020adfa3c7000000b0021d7ae39d1dso1355284wrb.12 for ; Tue, 12 Jul 2022 05:04:52 -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=IEBolIoZw/XohkFMPFGPhPl3/8YtO9CROqa/m7AZics=; b=S6TDO0A9q9LH1yoAe78r7FEqa0koCSaTY5TSzSIhCB3xYnCglU+kDWsdqyUE+W6+4e QkR+81dnqhqW2cS/iocgHf/lnz3PthcIVZ54MkgGBpAzrGnBMGAGD+f8i+PtZ6QvaF4m kzYZ1TIBUfTQlMrh6Zj7Vz0R0qWTQxAYYjCq4PjEeUyIyr+bYK7htoABsry3cV3eOQn7 iK18TSluraCFVgACStoUCex/s0JTwloY6mzrsUsEprcGNL60QOKQU5WzaN109W+PLZmp aB1Yc69/NWDXsEFkKERTaw7v2RPb/GbyJTDe20bubnX+t3AQ/dLed/1gjeVgrj2ViVlB FISw== X-Gm-Message-State: AJIora+a7+QSoYxg9f5etR+qSXqS03ZPwvAQH8DYmoE/bHtDUasf6Vwe af/DM4TkvowKAm+A3ABrYHGjPYOr8VPMwHBxSxGqOwDlY1OyknZ8zANQ0NDGI4sjS128PZqrN0N OhVaFgQxt9ocfJWqTOaVH24wuSg0wA/W8CCjlaMTgnw== X-Received: by 2002:adf:eb4b:0:b0:21d:68a4:a79e with SMTP id u11-20020adfeb4b000000b0021d68a4a79emr21226473wrn.608.1657627491623; Tue, 12 Jul 2022 05:04:51 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u1u5SMlE7pxf71GRgkLDlS4KnufkGNVImNrsR+RNjE7iM836HgL5WGDqtB8aA/03oc5G9+eQ== X-Received: by 2002:adf:eb4b:0:b0:21d:68a4:a79e with SMTP id u11-20020adfeb4b000000b0021d68a4a79emr21226444wrn.608.1657627491169; Tue, 12 Jul 2022 05:04:51 -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.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 05:04:50 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 03/16] UBUNTU: [Config] Disable CONFIG_FONT_6x8 on riscv64 Date: Tue, 12 Jul 2022 14:04:34 +0200 Message-Id: <20220712120447.355124-4-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 4e71ee8464e0..eb956dc5d413 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -171,7 +171,6 @@ CONFIG_FEALNX=m CONFIG_FIREWIRE=m CONFIG_FIREWIRE_NOSY=m CONFIG_FIRMWARE_MEMMAP=y -# CONFIG_FONT_6x8 is not set CONFIG_FORTIFY_SOURCE=y CONFIG_FPGA_BRIDGE=m CONFIG_FPGA_DFL=m diff --git a/debian.master/config/annotations b/debian.master/config/annotations index f2d8dacaa3bd..ecb9f10fde80 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -12001,7 +12001,7 @@ CONFIG_FONT_10x18 policy<{'amd64': 'n', 'arm64': ' CONFIG_FONT_SUN8x16 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> CONFIG_FONT_SUN12x22 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> CONFIG_FONT_TER16x32 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> -CONFIG_FONT_6x8 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'y', 's390x': 'n'}> +CONFIG_FONT_6x8 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> # Menu: Library routines >> XZ decompression support CONFIG_XZ_DEC 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 4649e94119bd..905badc4a32e 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -182,7 +182,6 @@ CONFIG_FEALNX=m CONFIG_FIREWIRE=m CONFIG_FIREWIRE_NOSY=m CONFIG_FIRMWARE_MEMMAP=y -# CONFIG_FONT_6x8 is not set CONFIG_FORTIFY_SOURCE=y CONFIG_FPGA_BRIDGE=m CONFIG_FPGA_DFL=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 09da64415cb7..5a8d7276a948 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -174,7 +174,6 @@ CONFIG_FEALNX=m CONFIG_FIREWIRE=m CONFIG_FIREWIRE_NOSY=m CONFIG_FIRMWARE_MEMMAP=y -# CONFIG_FONT_6x8 is not set CONFIG_FORTIFY_SOURCE=y CONFIG_FPGA_BRIDGE=m CONFIG_FPGA_DFL=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index c2855fa0d319..f7c7f5ec1e0b 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3836,6 +3836,7 @@ CONFIG_FONTS=y # CONFIG_FONT_10x18 is not set CONFIG_FONT_6x10=y # CONFIG_FONT_6x11 is not set +# CONFIG_FONT_6x8 is not set # CONFIG_FONT_7x14 is not set CONFIG_FONT_8x16=y CONFIG_FONT_8x8=y diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 2e30608710e0..821ffc6cadd8 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -173,7 +173,6 @@ CONFIG_FEALNX=m CONFIG_FIREWIRE=m CONFIG_FIREWIRE_NOSY=m CONFIG_FIRMWARE_MEMMAP=y -# CONFIG_FONT_6x8 is not set CONFIG_FORCE_MAX_ZONEORDER=9 CONFIG_FORTIFY_SOURCE=y CONFIG_FPGA_BRIDGE=m diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index 15424da6ab39..065e3a4bfc77 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -172,7 +172,6 @@ CONFIG_FEALNX=m CONFIG_FIREWIRE=m CONFIG_FIREWIRE_NOSY=m CONFIG_FIRMWARE_MEMMAP=y -CONFIG_FONT_6x8=y # CONFIG_FORTIFY_SOURCE is not set CONFIG_FPGA_BRIDGE=m CONFIG_FPGA_DFL=m diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index cb977fc5bc42..fa902e5304bb 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -156,7 +156,6 @@ CONFIG_FB_CFB_IMAGEBLIT=m # CONFIG_FIREWIRE is not set # CONFIG_FIREWIRE_NOSY is not set # CONFIG_FIRMWARE_MEMMAP is not set -# CONFIG_FONT_6x8 is not set CONFIG_FORTIFY_SOURCE=y # CONFIG_FPGA_BRIDGE is not set # CONFIG_FPGA_DFL is not set From patchwork Tue Jul 12 12:04:35 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: 1655355 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=DngIleFQ; 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 4Lhzwj5hv3z9sB4 for ; Tue, 12 Jul 2022 22:05:41 +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 1oBEdx-0004NQ-DE; Tue, 12 Jul 2022 12:05:33 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oBEdJ-0003S3-7c for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 12:04:53 +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-1.canonical.com (Postfix) with ESMTPS id CE52A3F4D0 for ; Tue, 12 Jul 2022 12:04:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657627492; bh=glACz9/RTd2jTnUGpyUWBesFxTrHgfJiFA7KxDpPGJk=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=DngIleFQLzO3Bmj4BXggNbzNMqL1zhr2hkqGbL2f2+lcoWZaQcwKLMiBUhHHjgtgZ EEiEucV4xfK7wI1cbZCUkxAnCFTyZnCz4f/t4AQM+D0b+sZA670cyRJiwXyykLlv06 tOBrNXx7xM5KR3IEVRMCuklUaEhINcyaHE2jc9bFqG/V660EKz1NYsp3+VAToO/RU8 U540ko9M9V/QcD3nusfU5eyGPHxklNQqsNMvJAe3KUIYMtjbke8mODIXdqgJoPUbJp Zf9aEO0ntMR+fbMiKILYAdmoSi7mklmlPqZwZMwrUzMAW74a6ugYxK5toY6/+bEiFu YjKdz+Xm77YzA== Received: by mail-wm1-f71.google.com with SMTP id i5-20020a1c3b05000000b003a2e8a77dd1so621778wma.1 for ; Tue, 12 Jul 2022 05:04:52 -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=glACz9/RTd2jTnUGpyUWBesFxTrHgfJiFA7KxDpPGJk=; b=sCpGz+i+cQ+cXY5O3ytayxNKp4OGZNf910/qZRgVLYO1FB0rkd8S0I7y7BRA8jPOEb T6gdD9Irr8O2Em7j23iXHpg6v/3dxATKQZO9kyVShTvespud9/lYk8/orcmKJN7vWf4v 0VNNX5X2E+IS7uaiiJ47mmzWc/KOjsYZWUFefni/AnG/MkFjTL1y8dIKNnE/JDVsS6qG DzfZtoThVbbZT0vtEtGZ6+vsHe8Jo0s1twiuH83wA183qLbE1ucb1E0FoIhcmVhw9L/n mGRO8SPoQ4x16MFd+fssbpTpCVNKxj33JpWjyZ0VIFgmJOo7I5suRtzw/D7VBl20KOL0 VrPw== X-Gm-Message-State: AJIora9IOiZE3GLp7duE0she419zJGqXIuN52Z/jGvYt7SDXc30S26UM cR/vDkemaeub8rK/FVBuX7O8X4i45CNHEmYCN0sBeK2Z8QmHqTIxe1Ie2lhctxip/u5L6ANEarf RBukP9oeuwgkqoKLHs9sa1/8nqGSE5yhN7SwvdR3PGg== X-Received: by 2002:a5d:508c:0:b0:21d:68d5:83f0 with SMTP id a12-20020a5d508c000000b0021d68d583f0mr21110558wrt.505.1657627492312; Tue, 12 Jul 2022 05:04:52 -0700 (PDT) X-Google-Smtp-Source: AGRyM1um7wYnySz9BsapocSQYgwCVOuL/eKJjPa3Oc/L6lHirCQytxCn8sSoGjvfKvypeFRTB1dtSg== X-Received: by 2002:a5d:508c:0:b0:21d:68d5:83f0 with SMTP id a12-20020a5d508c000000b0021d68d583f0mr21110522wrt.505.1657627491956; Tue, 12 Jul 2022 05:04:51 -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.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 05:04:51 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 04/16] UBUNTU: [Config] Disable CONFIG_NTFS3_64BIT_CLUSTER on riscv64 Date: Tue, 12 Jul 2022 14:04:35 +0200 Message-Id: <20220712120447.355124-5-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/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 - 7 files changed, 2 insertions(+), 6 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index eb956dc5d413..1cb0fb296963 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -466,7 +466,6 @@ CONFIG_NOP_USB_XCEIV=m CONFIG_NOZOMI=m CONFIG_NR_CPUS=8192 CONFIG_NTB=m -# CONFIG_NTFS3_64BIT_CLUSTER is not set # CONFIG_NTFS_RW is not set CONFIG_NULL_TTY=m CONFIG_NUMA_BALANCING=y diff --git a/debian.master/config/annotations b/debian.master/config/annotations index ecb9f10fde80..71c482bec6d2 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -10706,7 +10706,7 @@ CONFIG_VFAT_FS mark note> DOS/FAT/EXFAT/NT Filesystems >> NTFS Read-Write file system support CONFIG_NTFS3_FS policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}> -CONFIG_NTFS3_64BIT_CLUSTER policy<{'amd64': 'n', 'arm64': 'n', 'ppc64el': 'n', 'riscv64': 'y', 's390x': 'n'}> +CONFIG_NTFS3_64BIT_CLUSTER policy<{'amd64': 'n', 'arm64': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> CONFIG_NTFS3_LZX_XPRESS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_NTFS3_FS_POSIX_ACL 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 905badc4a32e..c80f07c0c44a 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -489,7 +489,6 @@ CONFIG_NOP_USB_XCEIV=m CONFIG_NOZOMI=m CONFIG_NR_CPUS=256 CONFIG_NTB=m -# CONFIG_NTFS3_64BIT_CLUSTER is not set # CONFIG_NTFS_RW is not set CONFIG_NULL_TTY=m CONFIG_NUMA_BALANCING=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index f7c7f5ec1e0b..d73c560c84bc 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -7548,6 +7548,7 @@ CONFIG_NTB_PINGPONG=m CONFIG_NTB_SWITCHTEC=m CONFIG_NTB_TOOL=m CONFIG_NTB_TRANSPORT=m +# CONFIG_NTFS3_64BIT_CLUSTER is not set CONFIG_NTFS3_FS=m CONFIG_NTFS3_FS_POSIX_ACL=y CONFIG_NTFS3_LZX_XPRESS=y diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 821ffc6cadd8..d449c1ff14bd 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -476,7 +476,6 @@ CONFIG_NOP_USB_XCEIV=m CONFIG_NOZOMI=m CONFIG_NR_CPUS=2048 CONFIG_NTB=m -# CONFIG_NTFS3_64BIT_CLUSTER is not set CONFIG_NULL_TTY=m CONFIG_NUMA_BALANCING=y CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index 065e3a4bfc77..4ae9ad712de5 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -468,7 +468,6 @@ CONFIG_NOP_USB_XCEIV=m CONFIG_NOZOMI=m CONFIG_NR_CPUS=8 CONFIG_NTB=m -CONFIG_NTFS3_64BIT_CLUSTER=y # CONFIG_NTFS_RW is not set CONFIG_NULL_TTY=m # CONFIG_NUMA_BALANCING is not set diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index fa902e5304bb..c2a3f8be1fd7 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -427,7 +427,6 @@ CONFIG_NODES_SHIFT=1 # CONFIG_NOZOMI is not set CONFIG_NR_CPUS=512 # CONFIG_NTB is not set -# CONFIG_NTFS3_64BIT_CLUSTER is not set CONFIG_NTFS_RW=y # CONFIG_NULL_TTY is not set CONFIG_NUMA_BALANCING=y From patchwork Tue Jul 12 12:04:36 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: 1655346 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=e+8C353e; 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 4Lhzw94JdZz9sFk for ; Tue, 12 Jul 2022 22:05:13 +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 1oBEdW-0003gg-32; Tue, 12 Jul 2022 12:05:06 +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 1oBEdK-0003SN-3T for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 12:04:54 +0000 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (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 B9DCF3FC18 for ; Tue, 12 Jul 2022 12:04:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657627493; bh=j83eNmyIGpmDsKKIaJmTE7ZGwNJusOZ+avgl8+wv4uI=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=e+8C353e8flomvG3xE35kWWdTvQMFxp/WqtN4ZVY/dNTEVRg+4hSeDfpFxaF126PQ QHoV/Cnv8xIOiV1ftHgGPY3AMeJxFyl1zCv6F04nIMixetr+c+NzfXPY6yyfNOFHd5 JkbbjL+0MNSMga2SCGGrWkRmuuXMJKGx0gOyEtu5eR3TI+7m7tIK3aIKs0lBkQ2KnO c16/JT4ZRGLCyF1GZKsn3RjtzTMY/bOm6whn2nSIiIdfVdZgeHI27LsOsRIcAyov1X TXvsyViBGfJ9Kl+ROmzbapHRdPUCcuJ9HP1EAOjhS9Kk20NlOkDhE85ARd7Yv1zNMd CdINjO+72ReTQ== Received: by mail-wm1-f70.google.com with SMTP id 23-20020a05600c229700b003a2eda0c59cso773905wmf.7 for ; Tue, 12 Jul 2022 05:04:53 -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=j83eNmyIGpmDsKKIaJmTE7ZGwNJusOZ+avgl8+wv4uI=; b=NVZ7LmwurqP5UG23WJ88wk6nzIVbrr6oe2O3Mt81ZFKAkSXhRCEAFcFFFnGgRPuDq1 X835XPBXP3f1G8tJB2fprJBt6n8rGz6kUdQtMWf2ge6oZc4peJecbYCYSceZwsd7wSmY lKZEG4exNnNMNUnBdHFZOaLVbTDeH9WiIGkfzAZ+rKeuvysXmgfPgiKIonKO6a9y+l1m j6yPz1MI2Lxkz+X3vRblgi1hNONYDIb2jc4cw5GtevNfBKGnSrU+7mXwHaOgR5aCw8MI xzMa10acm5l6wWCIrRth44gGthN5PWEzhzfencabB2wfP5c9+zDbGgXzRXmpCHckkxO7 BfsA== X-Gm-Message-State: AJIora92f8uWw+KAy0B6aHZ4XIq5cHvFQTCqulNM+dlBuq6sUap4sdNj Ly4hjYP3czd96+/Ce6FdIKQ9uepANjscTnR13MBhlF+C9dZTh85Zwf6RbGEogUY5PnRtr+znnEN bG3lEN1iJoKvGW8GiGKyiOYE53h8sMP+sHt/rUzEqwQ== X-Received: by 2002:a5d:64c8:0:b0:21d:9873:bbf0 with SMTP id f8-20020a5d64c8000000b0021d9873bbf0mr15846926wri.150.1657627493266; Tue, 12 Jul 2022 05:04:53 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vqzFDweK6jyO+A3i/l5I1xBdiKyzBaPtf4uGPtZanr7ZvKV/F57utUsTanLCt3TfhpANbYkQ== X-Received: by 2002:a5d:64c8:0:b0:21d:9873:bbf0 with SMTP id f8-20020a5d64c8000000b0021d9873bbf0mr15846900wri.150.1657627492964; Tue, 12 Jul 2022 05:04:52 -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.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 05:04:52 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 05/16] UBUNTU: [Config] Disable CONFIG_SCSI_IZIP_EPP16 on riscv64 Date: Tue, 12 Jul 2022 14:04:36 +0200 Message-Id: <20220712120447.355124-6-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 - 7 files changed, 2 insertions(+), 6 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 1cb0fb296963..5825c60bacb0 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -577,7 +577,6 @@ CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_INIA100=m CONFIG_SCSI_INITIO=m CONFIG_SCSI_IPS=m -# CONFIG_SCSI_IZIP_EPP16 is not set CONFIG_SCSI_MPI3MR=m CONFIG_SCSI_MVSAS=m CONFIG_SCSI_MVUMI=m diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 71c482bec6d2..a2f2f146ee7d 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -8100,7 +8100,7 @@ CONFIG_SCSI_INITIO policy<{'amd64': 'm', 'arm64': ' CONFIG_SCSI_INIA100 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'n'}> CONFIG_SCSI_PPA policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_SCSI_IMM policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> -CONFIG_SCSI_IZIP_EPP16 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'y'}> +CONFIG_SCSI_IZIP_EPP16 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n'}> CONFIG_SCSI_IZIP_SLOW_CTR policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n'}> CONFIG_SCSI_STEX policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'n'}> CONFIG_SCSI_IPR policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': '-'}> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index c80f07c0c44a..5700acdf2ea9 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -601,7 +601,6 @@ CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_INIA100=m CONFIG_SCSI_INITIO=m CONFIG_SCSI_IPS=m -# CONFIG_SCSI_IZIP_EPP16 is not set CONFIG_SCSI_MPI3MR=m CONFIG_SCSI_MVSAS=m CONFIG_SCSI_MVUMI=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 5a8d7276a948..397aea89dc9f 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -583,7 +583,6 @@ CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_INIA100=m CONFIG_SCSI_INITIO=m CONFIG_SCSI_IPS=m -# CONFIG_SCSI_IZIP_EPP16 is not set CONFIG_SCSI_MPI3MR=m CONFIG_SCSI_MVSAS=m CONFIG_SCSI_MVUMI=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index d73c560c84bc..b1b056f2b328 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -9577,6 +9577,7 @@ CONFIG_SCSI_IPR_DUMP=y CONFIG_SCSI_IPR_TRACE=y CONFIG_SCSI_ISCI=m CONFIG_SCSI_ISCSI_ATTRS=m +# CONFIG_SCSI_IZIP_EPP16 is not set # CONFIG_SCSI_IZIP_SLOW_CTR is not set CONFIG_SCSI_LOGGING=y CONFIG_SCSI_LOWLEVEL=y diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index d449c1ff14bd..dd03e5e55001 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -584,7 +584,6 @@ CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_INIA100=m CONFIG_SCSI_INITIO=m CONFIG_SCSI_IPS=m -# CONFIG_SCSI_IZIP_EPP16 is not set CONFIG_SCSI_MPI3MR=m CONFIG_SCSI_MVSAS=m CONFIG_SCSI_MVUMI=m diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index 4ae9ad712de5..69bd3166d764 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -573,7 +573,6 @@ CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_INIA100=m CONFIG_SCSI_INITIO=m CONFIG_SCSI_IPS=m -CONFIG_SCSI_IZIP_EPP16=y CONFIG_SCSI_MPI3MR=m CONFIG_SCSI_MVSAS=m CONFIG_SCSI_MVUMI=m From patchwork Tue Jul 12 12:04:37 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: 1655351 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=h0XHuD48; 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 4LhzwX0qfRz9sB4 for ; Tue, 12 Jul 2022 22:05:32 +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 1oBEdn-00049F-3G; Tue, 12 Jul 2022 12:05:23 +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 1oBEdL-0003Ux-UK for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 12:04:55 +0000 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (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 AD0E83FC18 for ; Tue, 12 Jul 2022 12:04:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657627494; bh=tjP6r+6jA+2HFtsDn5Lk3WNmn12RpKW7+WruRfCoUpY=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=h0XHuD48ks92G6nnRlkclGAxwrLDKodgBp5xPvc2RlThKdZD7EIZJkm+k+degt7U5 Rk/uf0aznCdOB453/W2mH2s6ljaHEm+fsJ5Nl0HCpHCwPVZXKje/EE60HD8HIdJHgW y1tQUWZNVRC7nNoNU8NEYJ7ECDO1M77GtIPFlPqx/wsmfQ8Ze+0g6TFGx8zSMzBNUY J8Ri4VMU8o69XHKogNRbahc7Ufm6mfcWDYABsmC0/5GRB/8OivreedP40fZnpsGp5Q NFiNkdUmyTejVbIpUrUltC3n3D625EmGQuGlTECxHXg6/230KXG2JUXLuoK0mI8Ssl SOmeA4dbnbiCQ== Received: by mail-wr1-f69.google.com with SMTP id g9-20020adfa489000000b0021d6e786099so1341658wrb.7 for ; Tue, 12 Jul 2022 05:04:54 -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=tjP6r+6jA+2HFtsDn5Lk3WNmn12RpKW7+WruRfCoUpY=; b=BqVIIJCQkkgSVOnecn/g4plx3PBVwbhK+1J4nfJyoW6lJBFlCtg352CIM7PKtTW7A3 r/WYr5X60Hhie621F7tJE6HE0gM6Yx6dVx95i+oJ0UDPfIuxq3Q0aLq+jmGWGHrSMoSK VWqOFcNXNXr/ku0GsAkkjGQDxOWr/dMQVNOiibxdSIrFwqTDC27cPJuJiksGFDdKTF+I HiiruZhuJSOQ+Sse19GjCyhJMFeHzyTdy5HFFHy6UoBt3aSiHgUZIiRKcN4/7wzx1UsQ xqfUAqujgqDbzKxnayi5U384Of8mGj/Aaifx7Ca5IWNkeSxAfhj8ydD5asctWZrx9zFU rmtQ== X-Gm-Message-State: AJIora86AVHdNSXHDA+MDpQtcQIZgY2c+q2zKNP8dMewInnidOfXDK4v 6M1AbaenjQMF4E39gAyXIBpBGJfxZ6uHVfJTtrw3n8vU2LrvUz5vQ71cPsqWrL6eQImbC/rnsWq Zr3tGqX59DSm8MkMmWyndXQJfYOgFr+u6y330+cpTSA== X-Received: by 2002:a5d:69cf:0:b0:21d:6dc8:9e9f with SMTP id s15-20020a5d69cf000000b0021d6dc89e9fmr21542275wrw.636.1657627494120; Tue, 12 Jul 2022 05:04:54 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uyOBmK9R7Gah1Ic++Bsmh8cY4BFcuq1/GBZAGFKPZwLfGxmVS5/9enfin8XCWFAlFpBajAkQ== X-Received: by 2002:a5d:69cf:0:b0:21d:6dc8:9e9f with SMTP id s15-20020a5d69cf000000b0021d6dc89e9fmr21542255wrw.636.1657627493855; Tue, 12 Jul 2022 05:04:53 -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.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 05:04:53 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 06/16] UBUNTU: [Config] Disable CONFIG_SCSI_UFS_HWMON on riscv64 Date: Tue, 12 Jul 2022 14:04:37 +0200 Message-Id: <20220712120447.355124-7-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/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 - 6 files changed, 1 insertion(+), 5 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 5825c60bacb0..8ec56b63e88b 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -591,7 +591,6 @@ CONFIG_SCSI_SRP_ATTRS=m CONFIG_SCSI_STEX=m CONFIG_SCSI_SYM53C8XX_2=m CONFIG_SCSI_UFSHCD=m -# CONFIG_SCSI_UFS_HWMON is not set CONFIG_SCSI_WD719X=m CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SENSORS_APDS990X=m diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 5700acdf2ea9..fd74a9f3e920 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -615,7 +615,6 @@ CONFIG_SCSI_SRP_ATTRS=m CONFIG_SCSI_STEX=m CONFIG_SCSI_SYM53C8XX_2=m CONFIG_SCSI_UFSHCD=m -# CONFIG_SCSI_UFS_HWMON is not set CONFIG_SCSI_WD719X=m CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SENSORS_APDS990X=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 397aea89dc9f..b367d4d9c89a 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -597,7 +597,6 @@ CONFIG_SCSI_SRP_ATTRS=m CONFIG_SCSI_STEX=m CONFIG_SCSI_SYM53C8XX_2=m CONFIG_SCSI_UFSHCD=m -# CONFIG_SCSI_UFS_HWMON is not set CONFIG_SCSI_WD719X=m CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SENSORS_APDS990X=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index b1b056f2b328..005be64aa9d9 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -9619,6 +9619,7 @@ CONFIG_SCSI_UFS_DWC_TC_PLATFORM=m # CONFIG_SCSI_UFS_EXYNOS is not set CONFIG_SCSI_UFS_HISI=m CONFIG_SCSI_UFS_HPB=y +# CONFIG_SCSI_UFS_HWMON is not set CONFIG_SCSI_UFS_MEDIATEK=m CONFIG_SCSI_UFS_QCOM=m CONFIG_SCSI_UFS_TI_J721E=m diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index dd03e5e55001..048505981c18 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -598,7 +598,6 @@ CONFIG_SCSI_SRP_ATTRS=y CONFIG_SCSI_STEX=m CONFIG_SCSI_SYM53C8XX_2=m CONFIG_SCSI_UFSHCD=m -# CONFIG_SCSI_UFS_HWMON is not set CONFIG_SCSI_WD719X=m CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SENSORS_APDS990X=m diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index 69bd3166d764..bdc19fa215e2 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -587,7 +587,6 @@ CONFIG_SCSI_SRP_ATTRS=m CONFIG_SCSI_STEX=m CONFIG_SCSI_SYM53C8XX_2=m CONFIG_SCSI_UFSHCD=m -CONFIG_SCSI_UFS_HWMON=y CONFIG_SCSI_WD719X=m CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SENSORS_APDS990X=m From patchwork Tue Jul 12 12:04:38 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: 1655345 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=fyM5rFv/; 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 4Lhzw928Czz9sB4 for ; Tue, 12 Jul 2022 22:05:13 +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 1oBEdW-0003hQ-Lg; Tue, 12 Jul 2022 12:05:06 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oBEdM-0003Uu-37 for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 12:04:56 +0000 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (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-1.canonical.com (Postfix) with ESMTPS id 604983F4D0 for ; Tue, 12 Jul 2022 12:04:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657627495; bh=lSa7cWPz/jbQgG6PRHDOW3rv3ktu3vou+L1cV9mb+NI=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fyM5rFv/TF8qNccRe0LFtqvwj1JT6mtTslooGSnAa8ouzdGgkSQ1OaCvSU0aIUNov NH2JPT1aXSloulkV2yRLBZmXmEwWJcmy0yzJ7Ub8J7zFZDdjeCsZIfWiHcgwhmLbAU r7CwbNgwpnx0Eu/xZcGouB+1Wdq3IR/xyuIDjIlQDoYbULyxdIAbVtipjW8F40zaAj p/CQvv1KLYhYlfrsONQZQI5jWu9vtO29mRkn4wT25oh1Gt8vpKy5PYVrRZ5yuXRioI N9SgMGKB482FedKBKuOgjzi/QO5PjSbeQgM979WOyxgI1uICiHNBULZoCXZxfD5SiQ i3Mv8Qktq9sHQ== Received: by mail-wr1-f70.google.com with SMTP id j23-20020adfb317000000b0021d7986c07eso1344029wrd.2 for ; Tue, 12 Jul 2022 05:04:55 -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=lSa7cWPz/jbQgG6PRHDOW3rv3ktu3vou+L1cV9mb+NI=; b=pQ7l6sCCTLWEel+kiLDxICnZt5hQYZdmSwyWinwn9qfY6YzRs3wOpvqD/FhlMhxGFx 5h4wZoQxiPKirrcqq6iG2Pl2J1HMDZ7p14ByPZrflogPWKKwSYTI8AfGSo1m9jqHelNJ oBCdfxdyEZWuMTL3t4z+CW4H38qWVzfcA+aI0hMgF97qPvi0et8u3GOxalBfcdPuzNgv YowQr/wk+tZDFLwxkBv3QbPmGT0jk0GLYHxABxgnKhsw3gV7ZI7+ChmCFVZurrVSe/RS wGVK2s8mYaBU26Tajc9hr/W+aYU6Fgo65xv7RGlqNZiLPBraxWES7qFR0/OvAIHm3htv vHxg== X-Gm-Message-State: AJIora/luHmQ+BLXuSbhzvq7c7F+7+2aVkBBngzJIdgpsh+0ED3vxWnu yBrIbxNENHituLaZrX/4hmUH82OUWVDMA3Zk772j4wBWfJpfJVlal3ctaoEqG3a0h36qLQZN5UP 5Vy4DNybnqFPzDP/5N96xTJwNr9jm8IIaK+0fTkch3w== X-Received: by 2002:a5d:634d:0:b0:21d:6789:3e4d with SMTP id b13-20020a5d634d000000b0021d67893e4dmr23382050wrw.321.1657627494801; Tue, 12 Jul 2022 05:04:54 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tJ8+QyqOv0My6ETDIZ3y9lRKPqbEvnegiC9iaflRqWRTYcmdMEJRq/slcDjiVQO5BdYv6T/A== X-Received: by 2002:a5d:634d:0:b0:21d:6789:3e4d with SMTP id b13-20020a5d634d000000b0021d67893e4dmr23382022wrw.321.1657627494489; Tue, 12 Jul 2022 05:04:54 -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.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 05:04:54 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 07/16] UBUNTU: [Config] Disable CONFIG_SPI_AX88796C_COMPRESSION on riscv64 Date: Tue, 12 Jul 2022 14:04:38 +0200 Message-Id: <20220712120447.355124-8-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/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 - 6 files changed, 1 insertion(+), 5 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 8ec56b63e88b..8cd104f2436f 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -632,7 +632,6 @@ CONFIG_SOC_TI=y CONFIG_SOLARIS_X86_PARTITION=y CONFIG_SOUND=m CONFIG_SPI=y -# CONFIG_SPI_AX88796C_COMPRESSION is not set CONFIG_SPI_ROCKCHIP=m CONFIG_SPI_SIFIVE=m CONFIG_SPMI=m diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index fd74a9f3e920..098aaa0d89cd 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -662,7 +662,6 @@ CONFIG_SOC_TI=y CONFIG_SOLARIS_X86_PARTITION=y CONFIG_SOUND=m CONFIG_SPI=y -# CONFIG_SPI_AX88796C_COMPRESSION is not set CONFIG_SPI_ROCKCHIP=m CONFIG_SPI_SIFIVE=m CONFIG_SPMI=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index b367d4d9c89a..b5265632e6df 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -644,7 +644,6 @@ CONFIG_SOC_TI=y CONFIG_SOLARIS_X86_PARTITION=y CONFIG_SOUND=y CONFIG_SPI=y -# CONFIG_SPI_AX88796C_COMPRESSION is not set CONFIG_SPI_ROCKCHIP=m CONFIG_SPI_SIFIVE=m CONFIG_SPMI=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 005be64aa9d9..aaae05ed9ff9 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -11061,6 +11061,7 @@ CONFIG_SPI_AMD=m CONFIG_SPI_ARMADA_3700=m CONFIG_SPI_ASPEED_SMC=m CONFIG_SPI_AX88796C=m +# CONFIG_SPI_AX88796C_COMPRESSION is not set CONFIG_SPI_AXI_SPI_ENGINE=m CONFIG_SPI_BCM2835=m CONFIG_SPI_BCM2835AUX=m diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 048505981c18..9ed4f8798ffa 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -640,7 +640,6 @@ CONFIG_SOC_TI=y CONFIG_SOLARIS_X86_PARTITION=y CONFIG_SOUND=m CONFIG_SPI=y -# CONFIG_SPI_AX88796C_COMPRESSION is not set # CONFIG_SPI_ROCKCHIP is not set CONFIG_SPI_SIFIVE=m CONFIG_SPMI=m diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index bdc19fa215e2..10d456f18188 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -629,7 +629,6 @@ CONFIG_SOC_TI=y CONFIG_SOLARIS_X86_PARTITION=y CONFIG_SOUND=m CONFIG_SPI=y -CONFIG_SPI_AX88796C_COMPRESSION=y # CONFIG_SPI_ROCKCHIP is not set CONFIG_SPI_SIFIVE=y CONFIG_SPMI=m From patchwork Tue Jul 12 12:04:39 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: 1655352 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=BE4k2jiZ; 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 4LhzwY6yBdz9sB4 for ; Tue, 12 Jul 2022 22:05:33 +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 1oBEdp-0004CX-Dp; Tue, 12 Jul 2022 12:05:25 +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 1oBEdM-0003VG-DF for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 12:04:56 +0000 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.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 2BE163FC18 for ; Tue, 12 Jul 2022 12:04:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657627496; bh=M9hGvB0L+4xM78Jb3IOubLa5mUuGFHPm1FbI93T2zn0=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BE4k2jiZ4t7nQI4mrMMQZxVcbqj3ZIfm7GpWr7WYxj/Z+nU2rKThG0W4hVX8kVHsN Gd9ZlSePRbvVDX/QIjHv0u8wtUiXQYop58/c1xQNVdOZgxB4W+kqoHskZOCVxwedgK S6LUDDjbRsHsWEO7kLGkLCGgwLKFOwuxDTjUpUslHN5J1qRp/rjze4l20n1xXc8W1f XhK2yVzEb/KkW5UkCFfRTNrxjS1ZWC6jg45uXTFHgdz/DwHzmF5hzdaQrpIT8eirQI 0rLsIcSIsYUj2+rJtzVZTBuvwqshp4VQDNta/IEgFS7CGZXVNdESUL3yXwSQxE5Tbt SoHpEsPUzryQA== Received: by mail-wr1-f71.google.com with SMTP id m7-20020adfa3c7000000b0021d7ae39d1dso1355344wrb.12 for ; Tue, 12 Jul 2022 05:04:56 -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=M9hGvB0L+4xM78Jb3IOubLa5mUuGFHPm1FbI93T2zn0=; b=KNS+ZP9O0GRjyXAI4V41JT0S3mXwbeaHG4W6kT8UrPOD2fqsDeIL1tW/JOrfT0wEUP 9Ctxk0hL6v6abHzvM+Oo0+K2xgk8oUGegpnYxf2kTtdVxumfCAvXHQZk92u6fdo3YQxP wHkktfSAMXFL/qG1hMVm7a9fZmdZYJ0wW7Gvc1Cx3mZio3PwAr/OIp9VkVQiAisne+mA kN2noy1YumGdY+9ZWZslAWb/oCWsYDTRgeWrc0AxHm7MCqtCdYoHBrABKTBgrdvt6MTN pPSwSlCBda2Isx91wMOHVOqDqtZ9XciikYSJkVtnaaNDtoaypZH7b2Wvu12OMpABIZaF bWgw== X-Gm-Message-State: AJIora/IjOamUSSNz2iBnbCYtNI7/l7Ump2HlmHVs9nObZ/kZxiaWixP b3ynSNQkFGuEBdYB4lKMoXMmULJzi9m1CrisGrz6SfcyNaTic837b516hVZf1HsNWWh7gXFyBmG rm8BIuVFqvHe9lbJk3DBYbqr57pQUH4lzR6uWKxhd4Q== X-Received: by 2002:a05:6000:1f0c:b0:21d:997b:53fc with SMTP id bv12-20020a0560001f0c00b0021d997b53fcmr15918265wrb.89.1657627495699; Tue, 12 Jul 2022 05:04:55 -0700 (PDT) X-Google-Smtp-Source: AGRyM1us33hVs8jHGLkecLVkmEc7zCuYPJofo0mKmJ4f6dQveVOwZQAkdfS4DF5xjxgE/vHWzY1PNA== X-Received: by 2002:a05:6000:1f0c:b0:21d:997b:53fc with SMTP id bv12-20020a0560001f0c00b0021d997b53fcmr15918239wrb.89.1657627495454; Tue, 12 Jul 2022 05:04:55 -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.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 05:04:54 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 08/16] UBUNTU: [Config] Disable CONFIG_VIDEO_ZORAN on riscv64 Date: Tue, 12 Jul 2022 14:04:39 +0200 Message-Id: <20220712120447.355124-9-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/arm64/config.common.arm64 | 1 - debian.master/config/armhf/config.common.armhf | 1 - debian.master/config/config.common.ubuntu | 8 +------- debian.master/config/ppc64el/config.common.ppc64el | 1 - debian.master/config/riscv64/config.common.riscv64 | 1 - 6 files changed, 1 insertion(+), 12 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 8cd104f2436f..409ccffea6d9 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -687,7 +687,6 @@ CONFIG_VFIO_IOMMU_TYPE1=y CONFIG_VFIO_PCI=y CONFIG_VFIO_PCI_CORE=y CONFIG_VFIO_VIRQFD=y -# CONFIG_VIDEO_ZORAN is not set CONFIG_VIRTIO_MMIO=y CONFIG_VMAP_STACK=y CONFIG_VME_BUS=y diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 098aaa0d89cd..44ad0428c1ec 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -719,7 +719,6 @@ CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_CORE=m CONFIG_VFIO_VIRQFD=m CONFIG_VIDEO_TI_CAL_MC=y -# CONFIG_VIDEO_ZORAN is not set CONFIG_VIRTIO_MMIO=y CONFIG_VMAP_STACK=y CONFIG_VME_BUS=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index b5265632e6df..561296ec8ce9 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -698,7 +698,6 @@ CONFIG_VFIO_IOMMU_TYPE1=y CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_CORE=m CONFIG_VFIO_VIRQFD=m -# CONFIG_VIDEO_ZORAN is not set CONFIG_VIRTIO_MMIO=y CONFIG_VMAP_STACK=y CONFIG_VME_BUS=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index aaae05ed9ff9..f62bcc773bbd 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -12801,13 +12801,7 @@ CONFIG_VIDEO_XILINX=m CONFIG_VIDEO_XILINX_CSI2RXSS=m CONFIG_VIDEO_XILINX_TPG=m CONFIG_VIDEO_XILINX_VTC=m -CONFIG_VIDEO_ZORAN_AVS6EYES=y -CONFIG_VIDEO_ZORAN_BUZ=y -CONFIG_VIDEO_ZORAN_DC10=y -CONFIG_VIDEO_ZORAN_DC30=y -CONFIG_VIDEO_ZORAN_LML33=y -CONFIG_VIDEO_ZORAN_LML33R10=y -CONFIG_VIDEO_ZORAN_ZR36060=y +# CONFIG_VIDEO_ZORAN is not set CONFIG_VIPERBOARD_ADC=m CONFIG_VIRTIO=y CONFIG_VIRTIO_BALLOON=y diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 9ed4f8798ffa..a351d076c521 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -691,7 +691,6 @@ CONFIG_VFIO=y CONFIG_VFIO_PCI=y CONFIG_VFIO_PCI_CORE=y CONFIG_VFIO_VIRQFD=y -# CONFIG_VIDEO_ZORAN is not set CONFIG_VIRTIO_MMIO=y # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set CONFIG_VME_BUS=y diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index 10d456f18188..df06b262103b 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -681,7 +681,6 @@ CONFIG_VFIO=m CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_CORE=m CONFIG_VFIO_VIRQFD=m -CONFIG_VIDEO_ZORAN=m CONFIG_VIRTIO_MMIO=y # CONFIG_VMAP_STACK is not set CONFIG_VME_BUS=y From patchwork Tue Jul 12 12:04:40 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: 1655353 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=dRFLGyn1; 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 4Lhzwd0g1Hz9sB4 for ; Tue, 12 Jul 2022 22:05:37 +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 1oBEds-0004Fk-4d; Tue, 12 Jul 2022 12:05:28 +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 1oBEdO-0003XP-OK for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 12:04:58 +0000 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (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 9D2D93FC18 for ; Tue, 12 Jul 2022 12:04:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657627497; bh=2SKzkrFvGytVhqjQk6UKequGQIgrfKzVfKOJ6e0ruwg=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dRFLGyn1AkKa9ui8qSKrAL0xyg+pXl1ba8h7vq/tEoOsPkT905MATiBaNFHICBySO njFn51zlxPDCC5PRBeX+DYYosJGx2KfN9ZTlxuX/soR4WP261rtO9BKnMpw2LN197/ LiClRcfb3Hi26ISbEXyFMGHCmVT+g+m/Jo8th3VX4Ygtmzxwi8gnboVUhjFs0c6xIV KTVoCBP876fWQk13G/g4H813YxgCjBcDjKk7MQh08jKADvwSLi4w6uv97fHHMaNaA5 nP3FL/ySsCB85fkpiLGfTw16vNv3MTbVsxd4XTZyrCRT1aevgqSZ9X/NATX2Hbo1+B 7kArq1YSsgiMw== Received: by mail-wm1-f72.google.com with SMTP id 2-20020a1c0202000000b003a2cfab44eeso6626781wmc.6 for ; Tue, 12 Jul 2022 05:04:57 -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=2SKzkrFvGytVhqjQk6UKequGQIgrfKzVfKOJ6e0ruwg=; b=IMBsBK/apboJ4vE2FsbghhKSWr1Q2MyYNPlvwpyTR3pJlilpD5Mrs7RHswy52lEwSI apmSbzG4nk9UhLplreRbtVoU9sTiwB8mOzY1YktwIiI+Bp5t6nzZEeRCxNrmk39vJjVv 5bRf23RKDIO1hBtPPeBq44UjvCgHEDe5NeU8SRkz+56exJJTj8+kK1YgHCR2/fY5ZD0T GHDPaMxXnOyBb3p+z/ea2z5C7JG+W050mEhGyVobpytqbeWO3B+JAjj/XzzOEpQVdr1h 1qh1eqU+mKZXluhRppaWGTVeYa4hyFtxNmcJ2YpMWT7IFKuK4EVj18wdWbkSolVrpYWt XuXg== X-Gm-Message-State: AJIora92ehEQtXiKicAUUNuAORgUp35Qsop+rC75Mw+aSaA/40HTqxII GHISZtPaRkFx7HtnWbB6/9k3LoxeoSfBc7PwcQ8MXmlyNm0C1V9856bk6sRRGndYqPq7hOuCB9H rivXocCQhtZj+a2X+dsF4PZFywZ/8H5LHi8/8ZKzqBw== X-Received: by 2002:a5d:5087:0:b0:21d:9925:e15a with SMTP id a7-20020a5d5087000000b0021d9925e15amr15186304wrt.43.1657627497098; Tue, 12 Jul 2022 05:04:57 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uQZkBK4deBgFE40CXtOXzXpAsum+sJNzTjHCnFyQP5H2Ud+Ubyg3LlwiIUFQqagKsrcP7sgA== X-Received: by 2002:a5d:5087:0:b0:21d:9925:e15a with SMTP id a7-20020a5d5087000000b0021d9925e15amr15186241wrt.43.1657627496384; Tue, 12 Jul 2022 05:04:56 -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.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 05:04:55 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 09/16] UBUNTU: [Config] Enable CONFIG_BPF_KPROBE_OVERRIDE on riscv64 Date: Tue, 12 Jul 2022 14:04:40 +0200 Message-Id: <20220712120447.355124-10-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/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 - 7 files changed, 2 insertions(+), 6 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 409ccffea6d9..df5cba5ec03b 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -53,7 +53,6 @@ CONFIG_BFS_FS=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_BLK_DEV_SX8=m -CONFIG_BPF_KPROBE_OVERRIDE=y CONFIG_BSD_DISKLABEL=y CONFIG_C2PORT=m CONFIG_CACHEFILES_ERROR_INJECTION=y diff --git a/debian.master/config/annotations b/debian.master/config/annotations index a2f2f146ee7d..130551ffdba0 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -11889,7 +11889,7 @@ CONFIG_BLK_DEV_IO_TRACE policy<{'amd64': 'y', 'arm64': ' CONFIG_KPROBE_EVENTS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_KPROBE_EVENTS_ON_NOTRACE policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> CONFIG_UPROBE_EVENTS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> -CONFIG_BPF_KPROBE_OVERRIDE policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 'riscv64': 'n', 's390x': 'y'}> +CONFIG_BPF_KPROBE_OVERRIDE policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_SYNTH_EVENTS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_HIST_TRIGGERS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_TRACE_EVENT_INJECT 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 44ad0428c1ec..20c1940d427f 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -55,7 +55,6 @@ CONFIG_BFS_FS=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_BLK_DEV_SX8=m -CONFIG_BPF_KPROBE_OVERRIDE=y CONFIG_BSD_DISKLABEL=y CONFIG_C2PORT=m CONFIG_CACHEFILES_ERROR_INJECTION=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index f62bcc773bbd..37ab5fd465fb 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1336,6 +1336,7 @@ CONFIG_BPF_EVENTS=y CONFIG_BPF_JIT=y CONFIG_BPF_JIT_ALWAYS_ON=y CONFIG_BPF_JIT_DEFAULT_ON=y +CONFIG_BPF_KPROBE_OVERRIDE=y CONFIG_BPF_LSM=y # CONFIG_BPF_PRELOAD is not set CONFIG_BPF_STREAM_PARSER=y diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index a351d076c521..e29ed7a88329 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -49,7 +49,6 @@ CONFIG_BFS_FS=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_BLK_DEV_SX8=m -CONFIG_BPF_KPROBE_OVERRIDE=y CONFIG_BSD_DISKLABEL=y CONFIG_C2PORT=m CONFIG_CACHEFILES_ERROR_INJECTION=y diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index df06b262103b..fb3c9688c3d2 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -48,7 +48,6 @@ CONFIG_BFS_FS=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_BLK_DEV_SX8=m -# CONFIG_BPF_KPROBE_OVERRIDE is not set CONFIG_BSD_DISKLABEL=y CONFIG_C2PORT=m # CONFIG_CACHEFILES_ERROR_INJECTION is not set diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index c2a3f8be1fd7..10e6de6fcfe7 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -39,7 +39,6 @@ CONFIG_AUTOFS_FS=y # CONFIG_BLK_DEV_3W_XXXX_RAID is not set # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set # CONFIG_BLK_DEV_SX8 is not set -CONFIG_BPF_KPROBE_OVERRIDE=y # CONFIG_BSD_DISKLABEL is not set # CONFIG_C2PORT is not set CONFIG_CACHEFILES_ERROR_INJECTION=y From patchwork Tue Jul 12 12:04:41 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: 1655350 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=og/86vLO; 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 4LhzwS74QNz9sB4 for ; Tue, 12 Jul 2022 22:05:28 +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 1oBEdi-00042a-Na; Tue, 12 Jul 2022 12:05:18 +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 1oBEdO-0003Yd-SI for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 12:04:58 +0000 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (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 7D3453FD77 for ; Tue, 12 Jul 2022 12:04:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657627498; bh=T53hzvND0WxuUnh7lfNNzsWmZ6/3LglEiz8wRkk4eXo=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=og/86vLOIgA0IHQ3/+g2WfpD3GArFFBNF6GZsXG2JoaDycn20tYXvttnjihQBX7N+ pGxraKHzpfewzj1ZsfAsSQRq2V2epaos/+0emPJB1xjlWuYEwr5JCVTssfPhRD7ze8 7hnMx9y5OJp+HXCcBxMuHYi7ApTMci3a5NivpknMvzGaT1jHAtLj5WMzJq+C//fk1i anggeqENG3grqb5Jv6k/f6gN+4CWP4zwkXY6a3uQNHPmwHrVE4QNPac86FaC89LjVA AHdTso2iSbgv2IgVkpwCBiQ1hyPwjmbN9c55Xa4El1+W20/OYSP8Y9TzNOvLg7vthj dqieNwBsUtSww== Received: by mail-wr1-f69.google.com with SMTP id k26-20020adfb35a000000b0021d6c3b9363so1340628wrd.1 for ; Tue, 12 Jul 2022 05:04:58 -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=T53hzvND0WxuUnh7lfNNzsWmZ6/3LglEiz8wRkk4eXo=; b=LQiX6NsEotGALN5IlwdELfdzuHcAj1hcsnd/oJU0YaFNGPFdQOPxB8qcZlddbvfW2c jcVbA9ScW7TYdTyWksEUMAIHFP7oyeQtC9eweuc895uZgIFTnjuJ8Z0w7bmEI9OzpGtG v6BFq/gzDoFR15SlxUCAUT7Juv1ZLnzPWrfMuqF2cyct+H42x4Ww5xoPG/0QR8p7v2aj vNC6evg5xSY9xYMOqkbDKeyBVIaSgWCaPnllxXkHJQsubd6UWKzTyxILRMxuE9BbthUF rAD6LHJBfktpFc6Al25O4DQ1nOK9Ig/ToHcBPtK8D1UeoxOmL05ZViu7320Im5idQIba ZLnA== X-Gm-Message-State: AJIora+J5RBzwIQrSgNHd8Tu9nmqjbIzw91npDm+lEGHTxkD2Gyo5nq3 KnBq4/OQT7HYmUgoB9Kq9z2RZ5WKzgNLoU0T/pP1AHj6OFpydpJxqAQreUo/6CB9o+RqrjTQ7bW XHIGsNvfQ4Yi/+pz69SotU5yMhxRkRj408exGj5tUZA== X-Received: by 2002:a5d:6149:0:b0:21d:6ba7:6095 with SMTP id y9-20020a5d6149000000b0021d6ba76095mr21236142wrt.680.1657627497234; Tue, 12 Jul 2022 05:04:57 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vSBPXte7UvcqF/+PBtDGE8WaeRZ1fDHNE7Pf16pEQc0PJvag65LqEOqCtqIu4ibzjZkzIZoA== X-Received: by 2002:a5d:6149:0:b0:21d:6ba7:6095 with SMTP id y9-20020a5d6149000000b0021d6ba76095mr21236112wrt.680.1657627496956; Tue, 12 Jul 2022 05:04:56 -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.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 05:04:56 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 10/16] UBUNTU: [Config] Enable CONFIG_CACHEFILES_ERROR_INJECTION on riscv64 Date: Tue, 12 Jul 2022 14:04:41 +0200 Message-Id: <20220712120447.355124-11-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/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 - 7 files changed, 1 insertion(+), 6 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index df5cba5ec03b..f8101b7e02e0 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -55,7 +55,6 @@ CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_BLK_DEV_SX8=m CONFIG_BSD_DISKLABEL=y CONFIG_C2PORT=m -CONFIG_CACHEFILES_ERROR_INJECTION=y CONFIG_CADENCE_WATCHDOG=m CONFIG_CAIF=m CONFIG_CAN=m diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 20c1940d427f..a5e25181fd2f 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -57,7 +57,6 @@ CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_BLK_DEV_SX8=m CONFIG_BSD_DISKLABEL=y CONFIG_C2PORT=m -CONFIG_CACHEFILES_ERROR_INJECTION=y CONFIG_CADENCE_WATCHDOG=m CONFIG_CAIF=m CONFIG_CAN=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 561296ec8ce9..85a695b750f7 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -52,7 +52,6 @@ CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_BLK_DEV_SX8=m CONFIG_BSD_DISKLABEL=y CONFIG_C2PORT=m -CONFIG_CACHEFILES_ERROR_INJECTION=y CONFIG_CADENCE_WATCHDOG=m CONFIG_CAIF=m CONFIG_CAN=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 37ab5fd465fb..dcaf1a1cedc1 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1469,6 +1469,7 @@ CONFIG_BYTCRC_PMIC_OPREGION=y CONFIG_C2PORT_DURAMAR_2150=m CONFIG_CACHEFILES=m # CONFIG_CACHEFILES_DEBUG is not set +CONFIG_CACHEFILES_ERROR_INJECTION=y # CONFIG_CACHEFILES_ONDEMAND is not set CONFIG_CACHE_FEROCEON_L2=y # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index e29ed7a88329..815177cf84bf 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -51,7 +51,6 @@ CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_BLK_DEV_SX8=m CONFIG_BSD_DISKLABEL=y CONFIG_C2PORT=m -CONFIG_CACHEFILES_ERROR_INJECTION=y CONFIG_CADENCE_WATCHDOG=m CONFIG_CAIF=m CONFIG_CAN=m diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index fb3c9688c3d2..77aecd8bf41d 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -50,7 +50,6 @@ CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_BLK_DEV_SX8=m CONFIG_BSD_DISKLABEL=y CONFIG_C2PORT=m -# CONFIG_CACHEFILES_ERROR_INJECTION is not set CONFIG_CADENCE_WATCHDOG=m CONFIG_CAIF=m CONFIG_CAN=m diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index 10e6de6fcfe7..565c6394bd5f 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -41,7 +41,6 @@ CONFIG_AUTOFS_FS=y # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BSD_DISKLABEL is not set # CONFIG_C2PORT is not set -CONFIG_CACHEFILES_ERROR_INJECTION=y # CONFIG_CADENCE_WATCHDOG is not set # CONFIG_CAIF is not set # CONFIG_CAN is not set From patchwork Tue Jul 12 12:04:42 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: 1655358 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=XmTTUp8M; 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 4Lhzwn6pHJz9sFk for ; Tue, 12 Jul 2022 22:05:45 +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 1oBEe1-0004Va-3n; Tue, 12 Jul 2022 12:05:37 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oBEdU-0003ea-Bo for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 12:05:04 +0000 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (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-1.canonical.com (Postfix) with ESMTPS id 880483F4D0 for ; Tue, 12 Jul 2022 12:05:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657627503; bh=kcz4G/suBB92M41t7MGHDuYS6ljGohDIMngsgSEdx3s=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XmTTUp8MJwn4LSh6c7dAMXc/rnYbH09ICv+Xpk33tkviEms3VMeS0k6AVN5GOVAu3 Qe9JbVPH4CtLSjscwt38UQTcuIglEzJAIsTTFEj2v6Sc3C4AloBQRSLXcoqSGg6oFN saCONpgqHeXpp8i7WALgP9rvdsFjnT5Pe020uE9tELwVFE1lswvqBS3GlnIWIR4rR8 KbhX3dZl43MMHNuTi6c0doROZH5YvgjEG0eR+Awkd2zqRDsBUJjjBmphY/XqZNkSR7 6OZpHa/fi9rhHL5Rr16TvLs0uL6hZfVYhF9U1W6GotflTQA/jzJImv7GDlb1nmHTsR t+ZncgVKbJZUg== Received: by mail-wr1-f69.google.com with SMTP id v23-20020adfa1d7000000b0021d620f5ef3so1353128wrv.16 for ; Tue, 12 Jul 2022 05:05:03 -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=kcz4G/suBB92M41t7MGHDuYS6ljGohDIMngsgSEdx3s=; b=HqSR2WbNK/D4FDrQtvKZpL3CtF9wO+PvH6fmFX8d3acRlQXE5Rz97bA/SY9nvCU17j hgmylHCnrYbZ3aIrPETjphyTg5Sb7YFLlPuaoC66OWXiBXDghvspdLHpfIdJP7eeNMwo nWjRm8UUUFDQLJ/7c1cYy2ZUWJol+cCDlM6bl+cDjAwhGWIsDXMdPCORIX6pgXysPzy8 YeepvzqkWI4lWWfuCIXVeD2NzzSqk7yJxhQh1y3aEgLVbHUZecCeUYaXXI8rY+ESUFz+ /mu8V7IMOZ4t++6N5Bm1T4dqDKnyBJDeQXNmTH31+u5cmlMlkMWRQpTGgo2cuoSK1C3/ 9jPQ== X-Gm-Message-State: AJIora83l0JKoaPfg/gnYPJl87ysOVDqNXmg+0EfxSfdixMcxZhYDZ3i rGIwH1gXEsZ0kOgCgYJ1Vnd439B66rqUPr6OqhpQkyU8YKznPGT7N9N7E6tO8SFma6yuMYpmSmQ PPhUcVq0e4Z7J7+d9ADi9F96LzE83i4npHBWogU0bYg== X-Received: by 2002:a05:600c:1f12:b0:3a2:e95b:5dc5 with SMTP id bd18-20020a05600c1f1200b003a2e95b5dc5mr3454058wmb.28.1657627498018; Tue, 12 Jul 2022 05:04:58 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t9uSiHqU5WBP5VFljix920cAThgag8oPhwz5KYhZfXJlr9TULqaY2T+nl5uuQaeFOYPiLvaQ== X-Received: by 2002:a05:600c:1f12:b0:3a2:e95b:5dc5 with SMTP id bd18-20020a05600c1f1200b003a2e95b5dc5mr3454031wmb.28.1657627497705; Tue, 12 Jul 2022 05:04:57 -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.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 05:04:57 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 11/16] UBUNTU: [Config] Enable CONFIG_DRM_AMD_DC_SI on riscv64 Date: Tue, 12 Jul 2022 14:04:42 +0200 Message-Id: <20220712120447.355124-12-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 - 7 files changed, 2 insertions(+), 6 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index f8101b7e02e0..641f803a2af2 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -90,7 +90,6 @@ CONFIG_DMA_VIRTUAL_CHANNELS=y CONFIG_DNET=m CONFIG_DP83TD510_PHY=m CONFIG_DRM_AMDGPU=m -CONFIG_DRM_AMD_DC_SI=y CONFIG_DRM_ANALOGIX_ANX78XX=m CONFIG_DRM_AST=m CONFIG_DRM_CIRRUS_QEMU=m diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 130551ffdba0..31caa142edee 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -2226,7 +2226,7 @@ CONFIG_DRM_AMD_ACP policy<{'amd64': 'y', 'arm64': ' # Menu: Device Drivers >> Graphics support >> Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) >> AMD GPU >> Display Engine Configuration CONFIG_DRM_AMD_DC policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}> CONFIG_DRM_AMD_DC_HDCP policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}> -CONFIG_DRM_AMD_DC_SI policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'n'}> +CONFIG_DRM_AMD_DC_SI policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}> CONFIG_DEBUG_KERNEL_DC policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n'}> CONFIG_DRM_AMD_SECURE_DISPLAY policy<{'amd64': 'y', 'ppc64el': 'y'}> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index a5e25181fd2f..0eb9d12d70f5 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -98,7 +98,6 @@ CONFIG_DMA_VIRTUAL_CHANNELS=y CONFIG_DNET=m CONFIG_DP83TD510_PHY=m CONFIG_DRM_AMDGPU=m -CONFIG_DRM_AMD_DC_SI=y CONFIG_DRM_ANALOGIX_ANX78XX=m CONFIG_DRM_AST=m CONFIG_DRM_CIRRUS_QEMU=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 85a695b750f7..10000c988072 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -91,7 +91,6 @@ CONFIG_DMA_VIRTUAL_CHANNELS=y CONFIG_DNET=m CONFIG_DP83TD510_PHY=m CONFIG_DRM_AMDGPU=m -CONFIG_DRM_AMD_DC_SI=y CONFIG_DRM_ANALOGIX_ANX78XX=m CONFIG_DRM_AST=m CONFIG_DRM_CIRRUS_QEMU=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index dcaf1a1cedc1..d8224d2a3941 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2917,6 +2917,7 @@ CONFIG_DRM_AMD_ACP=y CONFIG_DRM_AMD_DC=y CONFIG_DRM_AMD_DC_DCN=y CONFIG_DRM_AMD_DC_HDCP=y +CONFIG_DRM_AMD_DC_SI=y CONFIG_DRM_AMD_SECURE_DISPLAY=y CONFIG_DRM_ANALOGIX_ANX6345=m CONFIG_DRM_ANALOGIX_ANX7625=m diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 815177cf84bf..828701c40997 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -90,7 +90,6 @@ CONFIG_DMA_VIRTUAL_CHANNELS=m CONFIG_DNET=m CONFIG_DP83TD510_PHY=m CONFIG_DRM_AMDGPU=m -CONFIG_DRM_AMD_DC_SI=y CONFIG_DRM_ANALOGIX_ANX78XX=m CONFIG_DRM_AST=m CONFIG_DRM_CIRRUS_QEMU=m diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index 77aecd8bf41d..8f7dabb14e89 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -88,7 +88,6 @@ CONFIG_DMA_VIRTUAL_CHANNELS=m CONFIG_DNET=m CONFIG_DP83TD510_PHY=m CONFIG_DRM_AMDGPU=m -# CONFIG_DRM_AMD_DC_SI is not set CONFIG_DRM_ANALOGIX_ANX78XX=m CONFIG_DRM_AST=m CONFIG_DRM_CIRRUS_QEMU=m From patchwork Tue Jul 12 12:04:43 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: 1655347 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=TDBtDy85; 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 4LhzwJ27pRz9sB4 for ; Tue, 12 Jul 2022 22:05:20 +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 1oBEda-0003op-8G; Tue, 12 Jul 2022 12:05:10 +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-0003ab-2F for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 12:05:00 +0000 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (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 39DB53FC18 for ; Tue, 12 Jul 2022 12:04:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657627499; bh=vh411N5mb3EfAnrDfyIP7sL/mmd/PIie1cAIUumNeNw=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TDBtDy852aJ9GuNFUNmXnDDdU4R0/NEA65Jg8ImJqGyYrBLIddkziZL7pf2N4dEcs Pu1BP5RrmhBX/u3JfuCKlquQ4tocOmgsV3AQmuRDunTjYgPkAVPcAhmEoQWfnvP5hB KhS0/OJdgr46DkqV8RBnkzDkFTotboNSMnsvVenolSFNKGSWv0Vl7ruNXWTCOzbWBa dn2I3i1m3fsqF7uTsZM6fS3nPJnolps46XlIRBeIRjAaKoNCQj4hwUD6g1GP8PMOy/ mGaKi5wiy0bkyju9RIqQLgMMavCVvkr4UE4G/GpBCnPOOdB2KxXPtLO94LTfQ/xzK3 AQuy++dbKo8Gg== Received: by mail-wm1-f72.google.com with SMTP id m20-20020a05600c4f5400b003a03aad6bdfso3985825wmq.6 for ; Tue, 12 Jul 2022 05:04:59 -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=vh411N5mb3EfAnrDfyIP7sL/mmd/PIie1cAIUumNeNw=; b=njbBVE15c0vnblHd8jaTKwTQEO/Xky1aWqCAZnPel/9Y2zzB5muOGilb0hYJiuD/7Y UlGhiwOmmcPX4MnBfbEUFWonjYLhukSUzhXzF+dKm0Fpt7BUcuAAmqaMBsnKgtEOz0kv FTaPYRbk5hwgE12R6i/3dY+gtIMYV5HDENsbCe5k4d70Hh0lKzY018ZVKLiw+qxOUO0O DDg/CTDcSiNcsJ2SbghbSQQRjxYowXemUvg6jekyoq0IwrWhCY9bqopGmwcl1uthlcoY h03X7hGUs+ITRMYYs/13hhn8i3QbTP7IsS7AhF8wHE7uvcnHDplstkovxeb1FNpKU12l Qb8Q== X-Gm-Message-State: AJIora/f0kvjBy5ePCUqca1JZ7dtPAYfxa/VPXm/AbHKpMEO3aY4O3Zi jiiNWX7GVHLxLwdxfqN3eGT4yNBM/+eq075WT1XhmnjbprRXaB//EYSMWOVdqsW/ypmPKYMJvfG BAvsy3B8T76RBcSqbR1pAo3xWsMsio0JO2YIhHxTgrw== X-Received: by 2002:a5d:4c49:0:b0:21d:6df5:beb7 with SMTP id n9-20020a5d4c49000000b0021d6df5beb7mr21896665wrt.286.1657627498674; Tue, 12 Jul 2022 05:04:58 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sKbB6o/LOhNXSRAOXCS2UDM9Pk11CscuoWPijsQlNm2b15UtLmoZOqDyx/kAsXqjTzn9zjPQ== X-Received: by 2002:a5d:4c49:0:b0:21d:6df5:beb7 with SMTP id n9-20020a5d4c49000000b0021d6df5beb7mr21896632wrt.286.1657627498355; Tue, 12 Jul 2022 05:04:58 -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.57 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 12/16] UBUNTU: [Config] Enable CONFIG_NUMA_BALANCING on riscv64 Date: Tue, 12 Jul 2022 14:04:43 +0200 Message-Id: <20220712120447.355124-13-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 | 4 ++-- debian.master/config/arm64/config.common.arm64 | 1 - debian.master/config/config.common.ubuntu | 1 + debian.master/config/ppc64el/config.common.ppc64el | 1 - debian.master/config/riscv64/config.common.riscv64 | 2 +- debian.master/config/s390x/config.common.s390x | 1 - 7 files changed, 4 insertions(+), 7 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 641f803a2af2..f69263f91b38 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -465,7 +465,6 @@ CONFIG_NR_CPUS=8192 CONFIG_NTB=m # CONFIG_NTFS_RW is not set CONFIG_NULL_TTY=m -CONFIG_NUMA_BALANCING=y CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y CONFIG_NVMEM=y CONFIG_NVRAM=m diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 31caa142edee..59638108f3cf 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -11231,8 +11231,8 @@ CONFIG_LOG_BUF_SHIFT policy<{'amd64': '18', 'arm64': CONFIG_LOG_CPU_MAX_BUF_SHIFT policy<{'amd64': '12', 'arm64': '12', 'armhf': '12', 'ppc64el': '12', 'riscv64': '12', 's390x': '12'}> CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT policy<{'amd64': '13', 'arm64': '13', 'armhf': '13', 'ppc64el': '13', 'riscv64': '13', 's390x': '13'}> CONFIG_PRINTK_INDEX policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> -CONFIG_NUMA_BALANCING policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 'riscv64': 'n', 's390x': 'y'}> -CONFIG_NUMA_BALANCING_DEFAULT_ENABLED policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 's390x': 'n'}> +CONFIG_NUMA_BALANCING policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> +CONFIG_NUMA_BALANCING_DEFAULT_ENABLED policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'n'}> CONFIG_CHECKPOINT_RESTORE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_SCHED_AUTOGROUP policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_SYSFS_DEPRECATED policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 0eb9d12d70f5..087599bee316 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -488,7 +488,6 @@ CONFIG_NR_CPUS=256 CONFIG_NTB=m # CONFIG_NTFS_RW is not set CONFIG_NULL_TTY=m -CONFIG_NUMA_BALANCING=y CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y CONFIG_NVMEM=y CONFIG_NXP_C45_TJA11XX_PHY=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index d8224d2a3941..8bb74f870e45 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -7558,6 +7558,7 @@ CONFIG_NTFS3_LZX_XPRESS=y # CONFIG_NTFS_DEBUG is not set CONFIG_NTFS_FS=m CONFIG_NUMA=y +CONFIG_NUMA_BALANCING=y # CONFIG_NUMA_EMU is not set CONFIG_NUMA_KEEP_MEMINFO=y CONFIG_NVDIMM_DAX=y diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 828701c40997..a0588eee4521 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -474,7 +474,6 @@ CONFIG_NOZOMI=m CONFIG_NR_CPUS=2048 CONFIG_NTB=m CONFIG_NULL_TTY=m -CONFIG_NUMA_BALANCING=y CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y CONFIG_NVMEM=y CONFIG_NVRAM=y diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index 8f7dabb14e89..2c9d903b4bcd 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -467,7 +467,7 @@ CONFIG_NR_CPUS=8 CONFIG_NTB=m # CONFIG_NTFS_RW is not set CONFIG_NULL_TTY=m -# CONFIG_NUMA_BALANCING is not set +CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y CONFIG_NVMEM=y CONFIG_NXP_C45_TJA11XX_PHY=m CONFIG_N_GSM=m diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index 565c6394bd5f..26a95e6adbb1 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -427,7 +427,6 @@ CONFIG_NR_CPUS=512 # CONFIG_NTB is not set CONFIG_NTFS_RW=y # CONFIG_NULL_TTY is not set -CONFIG_NUMA_BALANCING=y # CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set # CONFIG_NVMEM is not set # CONFIG_NXP_C45_TJA11XX_PHY is not set 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 From patchwork Tue Jul 12 12:04:45 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: 1655359 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=Xb6wAD1J; 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 4Lhzwx0Gkzz9sB4 for ; Tue, 12 Jul 2022 22:05:53 +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 1oBEe7-0004lJ-7s; Tue, 12 Jul 2022 12:05:43 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oBEdj-00041v-5b for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 12:05:19 +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-1.canonical.com (Postfix) with ESMTPS id 15F493F4D0 for ; Tue, 12 Jul 2022 12:05:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657627517; bh=78J86tRNMKr2QEjH4VgR4IFJwQHxPsXXNtvAwn3GttQ=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Xb6wAD1JqKufPQ9qdKygLPUOvcAszKv77CEx3yZvk0KwZUzDoii57VKNZNdYFAod0 P/qq2f7c9WLj/MC8HoMF0Ds4D60mAJyHB2Uvic4HbthvcfRoMpov9cspISpdJkqQen Q8AyfQDjgJUNxEmNWxAL752i1EifNRd3wDxeZumid+nRJWEyrRxlZ/+oNH6tBR3S8N 1rtZt69pBIshjqyrSH6jZmvbP57LuSY40cPn+CLixJrEANSschmvKTbGB0Rcucw6Zs k8Mugp4tX1w8OgLfPtBMlgbxZ32TrNcNJ5aY84uYOOgiO3JJHYy6/qvr1S5hhXPCZp 2jAD4eH0oT61Q== Received: by mail-wm1-f71.google.com with SMTP id t4-20020a1c7704000000b003a2cfaeca37so3669566wmi.5 for ; Tue, 12 Jul 2022 05:05:17 -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=78J86tRNMKr2QEjH4VgR4IFJwQHxPsXXNtvAwn3GttQ=; b=dPAWpvcBR75bLFkyNJ75ehagGjaDlQF6ouFOOLdVoi5rrJF1ABZsfm1zfLejBbmgd8 MiSAgZjFNUZgH98MRu4Gqe7DSv0u3XsKjJxhP7LwPYEf4621W1+Jdijxebl2bNFxYX53 v0ZRBbD8s/UWh4DW/84q1N/0Pv7WNfYFhHkCqWv3BgI/R3+kFuNKORCbfq0DQhwHpQoz 98tFdnF1m8R70TGCrGxb58WAr3Fd3UR9fg0f2PHp8z1SMSJPIVhobtOvQGrBBnAcj8Iv DLrD027HdATc3g7iKXgqWZ0nqhE2SCTzDgtlTQGl1EwNWaDbYLh3CXctAUY10TEcm07g PAAw== X-Gm-Message-State: AJIora8kcUmMIW4i2vIEJzWgFOOM/9asG+EpwY3k7B4CDw+tfz7jCJP6 E62RdnCvek3+AIAklXG7SgFAuHJ5fGENPR2TTj6EGCSe46Y7iGga5IbEkBUgWeLolBO+w7xYwOM 6WEI3/URGkkTFwEEq4ULUUObvWrfToYE/CavLZJUQCg== X-Received: by 2002:a5d:5919:0:b0:21d:60cf:cbf4 with SMTP id v25-20020a5d5919000000b0021d60cfcbf4mr20813918wrd.188.1657627500443; Tue, 12 Jul 2022 05:05:00 -0700 (PDT) X-Google-Smtp-Source: AGRyM1stZ5HozOV4b53EyZkKxxPAcRLcXVH/UjWM32w+63fSRlAm0hs5ZgXOWg58vyxQ+whdHLlwCQ== X-Received: by 2002:a5d:5919:0:b0:21d:60cf:cbf4 with SMTP id v25-20020a5d5919000000b0021d60cfcbf4mr20813885wrd.188.1657627500091; Tue, 12 Jul 2022 05:05:00 -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.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 05:04:59 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 14/16] UBUNTU: [Config] Enable CONFIG_WLAN_VENDOR_MICROCHIP on riscv64 Date: Tue, 12 Jul 2022 14:04:45 +0200 Message-Id: <20220712120447.355124-15-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 | 8 ++++---- 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 - 7 files changed, 5 insertions(+), 9 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index fe2f97f269e3..0e156a243542 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -691,7 +691,6 @@ CONFIG_VXGE=m CONFIG_W1=m CONFIG_WAN=y CONFIG_WDTPCI=m -CONFIG_WLAN_VENDOR_MICROCHIP=y CONFIG_WWAN=y CONFIG_X25=m CONFIG_XEN=y diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 328af633d8a7..7a04ae19385d 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -6619,10 +6619,10 @@ CONFIG_AT76C50X_USB policy<{'amd64': 'm', 'arm64': ' CONFIG_WLAN_VENDOR_CISCO policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}> CONFIG_AIRO policy<{'amd64': 'm', 'ppc64el': 'm'}> CONFIG_AIRO_CS policy<{'amd64': 'm'}> -CONFIG_WLAN_VENDOR_MICROCHIP policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'n'}> -CONFIG_WILC1000_SDIO policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}> -CONFIG_WILC1000_SPI policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}> -CONFIG_WILC1000_HW_OOB_INTR policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}> +CONFIG_WLAN_VENDOR_MICROCHIP policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}> +CONFIG_WILC1000_SDIO policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> +CONFIG_WILC1000_SPI policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> +CONFIG_WILC1000_HW_OOB_INTR policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}> CONFIG_WLAN_VENDOR_RALINK policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}> CONFIG_WLAN_VENDOR_RSI policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}> CONFIG_WLAN_VENDOR_ST policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 7b04b130ce6a..72270e7d398c 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -723,7 +723,6 @@ CONFIG_VXGE=m CONFIG_W1=m CONFIG_WAN=y CONFIG_WDTPCI=m -CONFIG_WLAN_VENDOR_MICROCHIP=y CONFIG_WWAN=y CONFIG_X25=m CONFIG_XEN=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 92b2cac23531..26d3b1d3ecec 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -704,7 +704,6 @@ CONFIG_VXGE=m CONFIG_W1=m CONFIG_WAN=y CONFIG_WDTPCI=m -CONFIG_WLAN_VENDOR_MICROCHIP=y CONFIG_WWAN=y CONFIG_X25=m # CONFIG_XEN is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index d21e40243221..ddce83712bd0 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -12982,6 +12982,7 @@ CONFIG_WLAN_VENDOR_INTEL=y CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_WLAN_VENDOR_MARVELL=y CONFIG_WLAN_VENDOR_MEDIATEK=y +CONFIG_WLAN_VENDOR_MICROCHIP=y CONFIG_WLAN_VENDOR_PURELIFI=y CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_WLAN_VENDOR_RALINK=y diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 2c41e161b8e7..d2c0e9de2396 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -694,7 +694,6 @@ CONFIG_VXGE=m CONFIG_W1=m CONFIG_WAN=y CONFIG_WDTPCI=m -CONFIG_WLAN_VENDOR_MICROCHIP=y CONFIG_WWAN=y CONFIG_X25=m CONFIG_XILINX_EMACLITE=m diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index 8c01ca4f83bd..4b4a9150e59c 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -686,7 +686,6 @@ CONFIG_VXGE=m CONFIG_W1=m CONFIG_WAN=y CONFIG_WDTPCI=m -# CONFIG_WLAN_VENDOR_MICROCHIP is not set CONFIG_WWAN=m CONFIG_X25=m CONFIG_XILINX_EMACLITE=m From patchwork Tue Jul 12 12:04:46 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: 1655356 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=hd+3GaaM; 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 4Lhzwm0MLxz9sB4 for ; Tue, 12 Jul 2022 22:05:44 +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 1oBEdy-0004QS-MU; Tue, 12 Jul 2022 12:05:34 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oBEdT-0003d6-Fx for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 12:05:03 +0000 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (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-1.canonical.com (Postfix) with ESMTPS id 406F03F4D0 for ; Tue, 12 Jul 2022 12:05:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657627502; bh=/rIQlglhHhAjzlScHdGDYatA/sI6fLFNekW6ZM98gL0=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hd+3GaaMk6x8ahcgZ1+Zcr5TLWdmS9MOrUpBlwsjNNZvktaSKmeKJ4mOwObmWCu7A qHxOSpXSsN2BlL8Dj2J2MJlwxk4vT2bOzPmuRLBMuJg8+TFpt/s2cjo+A7K9ug91ko mP28/GFYFbgg4TTffV3+zt6bzmTqqEqWcGxX3mbOojlpoXNy2YgCSEyR/o+5ICxjTo MjXDjKZVbghxxHJ7q+YBeagCBaDzD5Ut31sYOs+0JUD7/FmlQczzduVeXdet+5i0bF Hscp/+t0ODrmJsAKVO6HTGKuvkE7J0AqCty6yofWX6nl+lwrGvbOBfRja+w6P2pvjR +tXUGvBJ7BJBg== Received: by mail-wr1-f70.google.com with SMTP id l5-20020adfa385000000b0021db73f5818so132626wrb.20 for ; Tue, 12 Jul 2022 05:05:02 -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=/rIQlglhHhAjzlScHdGDYatA/sI6fLFNekW6ZM98gL0=; b=dFsoDjNB8opkA+wflp0rA0WYHUCeZoiDg6TFd//ZLm0Q0iFvpi2V6xeHUIaB3ypvtU wVJFp+HVILZYpkTBlfrtKCPJ89Wsl4WmKRvk2cQAwVvUHIithwZ8xX/O3+F0PN89H6le /jAm0I7G0xctSC1mRt8Zu3pUiS3DSKzwXweIP51ziNc6JqJidRJwdHmUwBJJee887a3Y EMyF6YP3i1YH5Kxdpk63oG+YgSm8z6qqCq3QhNTLzFQtAZgwbYsEHKbmlAtSjlrGhI9d Nxqukldoo70xPVy2FPkr8xHqSqsscuAo/RqtbBmppNRjc651550cDHuEfLRUYLTQHN0t TUUw== X-Gm-Message-State: AJIora+mdVVTJYo+BEpQ84XhqHHsRspukB08vZ8U46vLhi81uRBHlHBZ UoyuwBY0Rem6N2qSbDR0R+AFRc26utha3/JwdAAJbTa7tdcQ5pnStGJKTu+JBTG1iKMT4UXxrhE UPrGmq4NT4GRj5NRh/BEp2lRWRi5IYnqqJeKwYqewOA== X-Received: by 2002:a05:600c:4306:b0:3a2:e9e0:3626 with SMTP id p6-20020a05600c430600b003a2e9e03626mr3375764wme.175.1657627501327; Tue, 12 Jul 2022 05:05:01 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u9B2x9r2eZ/8g5k9bW8cXS+puZqpNdQtj1RQ6N/s+bZl8Gvg/V+DhXIK/9dfpT0JAR/uSkrw== X-Received: by 2002:a05:600c:4306:b0:3a2:e9e0:3626 with SMTP id p6-20020a05600c430600b003a2e9e03626mr3375723wme.175.1657627500899; Tue, 12 Jul 2022 05:05:00 -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.05.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 05:05:00 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 15/16] UBUNTU: [Config] Set CONFIG_MHI_WWAN_CTRL=m on riscv64 Date: Tue, 12 Jul 2022 14:04:46 +0200 Message-Id: <20220712120447.355124-16-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 - 7 files changed, 2 insertions(+), 6 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 0e156a243542..4b2f6c759bd6 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -376,7 +376,6 @@ CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_WM8994=m CONFIG_MHI_BUS=m CONFIG_MHI_BUS_EP=m -CONFIG_MHI_WWAN_CTRL=m CONFIG_MII=m CONFIG_MINIX_FS=m CONFIG_MINIX_SUBPARTITION=y diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 7a04ae19385d..a8b5aefd863d 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -6932,7 +6932,7 @@ CONFIG_WILINK_PLATFORM_DATA policy<{'amd64': 'y', 'arm64': ' # Menu: Device Drivers >> Network device support >> Wireless WAN >> WWAN Driver Core CONFIG_WWAN policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'm', 's390x': 'n'}> CONFIG_WWAN_HWSIM policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': '-'}> -CONFIG_MHI_WWAN_CTRL policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'n'}> +CONFIG_MHI_WWAN_CTRL policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_MHI_WWAN_MBIM policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_RPMSG_WWAN_CTRL policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_IOSM policy<{'amd64': 'm'}> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 72270e7d398c..5bf633fab2b7 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -392,7 +392,6 @@ CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_WM8994=m CONFIG_MHI_BUS=m CONFIG_MHI_BUS_EP=m -CONFIG_MHI_WWAN_CTRL=m CONFIG_MII=y CONFIG_MINIX_FS=m CONFIG_MINIX_SUBPARTITION=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 26d3b1d3ecec..fc5d43b61bcd 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -378,7 +378,6 @@ CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_WM8994=m CONFIG_MHI_BUS=m CONFIG_MHI_BUS_EP=m -CONFIG_MHI_WWAN_CTRL=m CONFIG_MII=y CONFIG_MINIX_FS=m CONFIG_MINIX_SUBPARTITION=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index ddce83712bd0..c4bcc26f688c 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -6401,6 +6401,7 @@ CONFIG_MFD_WM8998=y # CONFIG_MHI_BUS_DEBUG is not set CONFIG_MHI_BUS_PCI_GENERIC=m CONFIG_MHI_NET=m +CONFIG_MHI_WWAN_CTRL=m CONFIG_MHI_WWAN_MBIM=m CONFIG_MHP_MEMMAP_ON_MEMORY=y CONFIG_MICREL_KS8995MA=m diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index d2c0e9de2396..7f82d024b307 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -382,7 +382,6 @@ CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_WM8994=m CONFIG_MHI_BUS=m CONFIG_MHI_BUS_EP=m -CONFIG_MHI_WWAN_CTRL=m CONFIG_MII=m CONFIG_MINIX_FS=m CONFIG_MINIX_SUBPARTITION=y diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index 4b4a9150e59c..b0c8c7e586ce 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -375,7 +375,6 @@ CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_WM8994=m CONFIG_MHI_BUS=m CONFIG_MHI_BUS_EP=m -# CONFIG_MHI_WWAN_CTRL is not set CONFIG_MII=m CONFIG_MINIX_FS=m CONFIG_MINIX_SUBPARTITION=y From patchwork Tue Jul 12 12:04:47 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: 1655348 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=QMQwsK5B; 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 4LhzwK2wZgz9sFk for ; Tue, 12 Jul 2022 22:05:21 +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 1oBEdb-0003r5-4K; Tue, 12 Jul 2022 12:05:11 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oBEdU-0003e3-3G for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 12:05:04 +0000 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (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-1.canonical.com (Postfix) with ESMTPS id D23613F4D1 for ; Tue, 12 Jul 2022 12:05:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657627502; bh=V3KByzJsUonm7V2zIjEhxgjwf6+q4iW4uQyifzFMP+o=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QMQwsK5Bz8n77TjM4jaIfSFH8xTlEHTsqCP9G9b9ms8umxbWbmcCiqDFvB3VETOY2 4OI8dHGTDAUe+ztXu4pCmIkfjdt/TOHwT/fHD8VCvkPGnJHRBm1vuXbwxeeqAIZvKa E6Y9TsbHqG+PwJeduBQdYOOmalDZEkMXrYyOvQhaUHYwRHiQ/pe7jv+DQ33Q8yAJBo 7z+taZAqSABNJOtLwKPBhimIJ8W2AAVXuwcmuHFOzGYkciR42s8SrSVsVtKQLnYa0A 0Q+hmgJmX0m6mZS+hhvg+cC2D9ShtOG+3oFBZ5rHkNPs2RLwqw/7WLCv7mwBATO4xu q1jNVPMmBtoDw== Received: by mail-wm1-f72.google.com with SMTP id x6-20020a05600c21c600b003a2e9d4a106so1476088wmj.6 for ; Tue, 12 Jul 2022 05:05:02 -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=V3KByzJsUonm7V2zIjEhxgjwf6+q4iW4uQyifzFMP+o=; b=mKs7c+w0gHKlFMSAh4oX8LkBQ4Tj7qH0tGA+w33B1pAgN1QwkkR+bKg3uEqsuQhIRT tUj2pXPXN1Gq1BSGrkABvDFAosamS01IV7OsAIQD79OoHci9uYX/OIH8cQTXmM1fdX4r GXI6bv5JlnKLv64Y3D0hp81Ded8NJLzmTdGlxHcbhquH/7xfUPIAOfohqEvioUizWogN EFO15C4JdUbNtybXIiKXMnMwE4nlSBOb9xXNdkT+f0K4/AyhJ3Zw2gGr2yyAhrUgr1TQ LMisc8kwtIkWYZf4PpA8zq+C/imNajFF7eAKaxVuBixlY0jFfhlJCMxZO9L2kyBI64ut xkUw== X-Gm-Message-State: AJIora8aKmVkLeuUvgjPSYDTDs6aHrtujVT6lA+uZXRp+WCL1AFRHwQE WIqUazohb5VA42AOqqfPJCIopBW+98bicNas8D8bp4QSa3AfTFMRvj9/Vo6/YWIF3dQiP1GJdS1 IsbUK9PPcju4K3njxUK2Q+CI7P7zIyX5nhbBJKvw/Ow== X-Received: by 2002:a05:600c:2c4c:b0:3a2:dd0f:fa03 with SMTP id r12-20020a05600c2c4c00b003a2dd0ffa03mr3465286wmg.18.1657627502045; Tue, 12 Jul 2022 05:05:02 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t6b8/Y+JeNQtT2Uu+v2qSoaLKJavtR5uHCeHBnsSGTfrjY9Z31zn2EPF/NtrzTEmh+3RXZxA== X-Received: by 2002:a05:600c:2c4c:b0:3a2:dd0f:fa03 with SMTP id r12-20020a05600c2c4c00b003a2dd0ffa03mr3465249wmg.18.1657627501697; Tue, 12 Jul 2022 05:05:01 -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.05.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 05:05:01 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 16/16] UBUNTU: [Config] Set CONFIG_NFC_S3FWRN82_UART=m on riscv64 Date: Tue, 12 Jul 2022 14:04:47 +0200 Message-Id: <20220712120447.355124-17-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 - 7 files changed, 2 insertions(+), 6 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 4b2f6c759bd6..7871708f6b2b 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -455,7 +455,6 @@ CONFIG_NET_VENDOR_VIA=y CONFIG_NET_VENDOR_WIZNET=y CONFIG_NEW_LEDS=y CONFIG_NFC=m -CONFIG_NFC_S3FWRN82_UART=m CONFIG_NFP=m CONFIG_NODES_SHIFT=10 CONFIG_NOP_USB_XCEIV=m diff --git a/debian.master/config/annotations b/debian.master/config/annotations index a8b5aefd863d..c239b2bedd06 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -12305,7 +12305,7 @@ CONFIG_NFC_ST_NCI_SPI policy<{'amd64': 'm', 'arm64': ' CONFIG_NFC_NXP_NCI policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_NFC_NXP_NCI_I2C policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_NFC_S3FWRN5_I2C policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> -CONFIG_NFC_S3FWRN82_UART policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'n'}> +CONFIG_NFC_S3FWRN82_UART policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_NFC_ST95HF policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> # Menu: Networking support >> Networking options diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 5bf633fab2b7..c1a8058b4819 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -478,7 +478,6 @@ CONFIG_NET_VENDOR_VIA=y CONFIG_NET_VENDOR_WIZNET=y CONFIG_NEW_LEDS=y CONFIG_NFC=m -CONFIG_NFC_S3FWRN82_UART=m CONFIG_NFP=m CONFIG_NODES_SHIFT=6 CONFIG_NOP_USB_XCEIV=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index fc5d43b61bcd..9d2ad7fbd5d2 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -464,7 +464,6 @@ CONFIG_NET_VENDOR_VIA=y CONFIG_NET_VENDOR_WIZNET=y CONFIG_NEW_LEDS=y CONFIG_NFC=m -CONFIG_NFC_S3FWRN82_UART=m CONFIG_NFP=m CONFIG_NOP_USB_XCEIV=y CONFIG_NOZOMI=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index c4bcc26f688c..8873bb8086ce 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -7307,6 +7307,7 @@ CONFIG_NFC_PN544_MEI=m CONFIG_NFC_PORT100=m CONFIG_NFC_S3FWRN5=m CONFIG_NFC_S3FWRN5_I2C=m +CONFIG_NFC_S3FWRN82_UART=m CONFIG_NFC_SHDLC=y CONFIG_NFC_SIM=m CONFIG_NFC_ST21NFCA=m diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 7f82d024b307..310ac136d3fc 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -465,7 +465,6 @@ CONFIG_NET_VENDOR_VIA=y CONFIG_NET_VENDOR_WIZNET=y CONFIG_NEW_LEDS=y CONFIG_NFC=m -CONFIG_NFC_S3FWRN82_UART=m CONFIG_NFP=m CONFIG_NODES_SHIFT=8 CONFIG_NOP_USB_XCEIV=m diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index b0c8c7e586ce..78711552b0ba 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -457,7 +457,6 @@ CONFIG_NET_VENDOR_VIA=y CONFIG_NET_VENDOR_WIZNET=y CONFIG_NEW_LEDS=y CONFIG_NFC=m -# CONFIG_NFC_S3FWRN82_UART is not set CONFIG_NFP=m CONFIG_NODES_SHIFT=2 CONFIG_NOP_USB_XCEIV=m