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