From patchwork Wed Oct 18 20:47:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Cabaj X-Patchwork-Id: 1851224 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S9jd528X0z1ypX for ; Thu, 19 Oct 2023 07:49:13 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qtDTK-0008Du-Sa; Wed, 18 Oct 2023 20:48:55 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qtDSL-0007uf-Db for kernel-team@lists.ubuntu.com; Wed, 18 Oct 2023 20:47:55 +0000 Received: from mail-yb1-f200.google.com (mail-yb1-f200.google.com [209.85.219.200]) (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 224773F20F for ; Wed, 18 Oct 2023 20:47:53 +0000 (UTC) Received: by mail-yb1-f200.google.com with SMTP id 3f1490d57ef6-d9a45e7e0f9so10054323276.0 for ; Wed, 18 Oct 2023 13:47:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697662072; x=1698266872; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5OnKE/SfyrBScsSMvmFZcO2DelbEL2Kw5XUu7gcHkmg=; b=b31Ur2TNItPsd6/u0cwiJ93Zd/bwvhkjpzN7jLG9Gzekg5zxruweHXF1RkZBuaPzVd 6Zv+1G+HF47nhM5vbulVQSPePYSxneplAJ92ZBRxc8yKN1XB6diitJVS6YzdaesIRcqv 6sVUzR+YjB7XnEXcF8iY0m3oVEVrPOAJL7oLSup0U9SW2/10tUdtGWtA8i5wPUq2Zc/i Fsx8iDpfprZKuLySYFtTboFuht1zqvb/luRbs93LJuGhkwH7oT8bFAEB79q+ERKDkjIY QD4aFF3ulZwieu0E6pU32KTQ0astYj81OFl26qZStH1boJqF+4KXa1nOsnyUQK3lkQoM ZsGw== X-Gm-Message-State: AOJu0YzAAu6NUqpCHnMHdIw0PI0UwonlFfS60pRb611nRtMGPijDgdAk K2hyF4RBP2PxxSkw0guQUtIiMzEU1xvNwqtSSWMe8wbRQKoTuI5ufYBWLadRTW2ChkMpspE6z2M CmaBdJPELriZodUHc62U4+wpJgCmaYoo2PM3x7+xOzu+25/Km5A== X-Received: by 2002:a25:3d5:0:b0:d9a:58e1:106d with SMTP id 204-20020a2503d5000000b00d9a58e1106dmr444831ybd.52.1697662072024; Wed, 18 Oct 2023 13:47:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFdmly2yO1b9kamSaRFdUOxm24tItKbyOZrVrAnPo4rWCsf7IiwC4vUek5Po1Ww4MeSnP+x/A== X-Received: by 2002:a25:3d5:0:b0:d9a:58e1:106d with SMTP id 204-20020a2503d5000000b00d9a58e1106dmr444827ybd.52.1697662071776; Wed, 18 Oct 2023 13:47:51 -0700 (PDT) Received: from smtp.gmail.com (h69-130-246-116.mdtnwi.broadband.dynamic.tds.net. [69.130.246.116]) by smtp.gmail.com with ESMTPSA id s8-20020ad44388000000b0065b0e724f83sm232562qvr.6.2023.10.18.13.47.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 13:47:51 -0700 (PDT) From: John Cabaj To: kernel-team@lists.ubuntu.com Subject: [SRU][mantic:linux-gcp][PATCH 1/1] UBUNTU: [Config] gcp: Inherit CONFIG_SYSFB_SIMPLEFB from master Date: Wed, 18 Oct 2023 15:47:47 -0500 Message-Id: <20231018204747.208180-4-john.cabaj@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231018204747.208180-1-john.cabaj@canonical.com> References: <20231018204747.208180-1-john.cabaj@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/2039732 CONFIG_SYSFB_SIMPLEFB was initially enabled for amd64 in generic, but was subsequently reverted. This was not reflected in the GCP kernel. Signed-off-by: John Cabaj --- debian.gcp/config/annotations | 1 - 1 file changed, 1 deletion(-) diff --git a/debian.gcp/config/annotations b/debian.gcp/config/annotations index 28c8d21ca903..da66460cfe8f 100644 --- a/debian.gcp/config/annotations +++ b/debian.gcp/config/annotations @@ -304,7 +304,6 @@ CONFIG_SPI_BCM_QSPI policy<{'arm64': 'm'}> CONFIG_SPI_INTEL policy<{'amd64': '-'}> CONFIG_SPI_INTEL_PCI policy<{'amd64': 'n'}> CONFIG_SPI_INTEL_PLATFORM policy<{'amd64': 'n'}> -CONFIG_SYSFB_SIMPLEFB policy<{'amd64': 'y', 'arm64': 'y'}> CONFIG_TASKS_RCU policy<{'amd64': '-', 'arm64': '-'}> CONFIG_TEE_BNXT_FW policy<{'arm64': 'm'}> CONFIG_TEST_DIV64 policy<{'amd64': 'n', 'arm64': 'm'}>