From patchwork Wed Oct 18 20:47:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Cabaj X-Patchwork-Id: 1851223 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 4S9jcf00tPz1ypX for ; Thu, 19 Oct 2023 07:48:49 +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 1qtDSy-0007yz-0h; Wed, 18 Oct 2023 20:48:34 +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-0007uU-1Q for kernel-team@lists.ubuntu.com; Wed, 18 Oct 2023 20:47:54 +0000 Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.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 AE6CC3F21F for ; Wed, 18 Oct 2023 20:47:52 +0000 (UTC) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-65aff02d602so84477166d6.1 for ; Wed, 18 Oct 2023 13:47:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697662071; x=1698266871; 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=U7VtUIUl+FYwNTFxwjNaZN7F+vtfVf6zNMjSXu4TrQc=; b=OvN1KoBxC314j4SAdACdpwxN5hg6RLm+29O6euMYsrD5v+JrBOVeBFHlGTBUjcOPad 4+AuC63bhC/q+38im9/Hw26kBvtLoAHK5JMBpsFNpCCq4NCLi9gDlbYKHQcEbr4eawWQ QmxNurnaQgHZ3lQn2bTtEnqlg6S0G36CLiUYRIql/BYpPJzw9ra6F1ugF0N2bXJ0rI6K tTL9zngIJtyzH5mlZ1bxwg+3f/qEMft17CqkYi59vYgLES/0Q6N6sPZbSn6s9Elxy5LW KRqkxLlg+ne3gKEo1bKx5hDbvs6qBIZQm7zNhaGU3++tjyaUNkERt9p6jMjEXHP1HVN3 n90w== X-Gm-Message-State: AOJu0Yxp8+/WQo5qRYmoaKyuLV6BceCEb0ZmgjT0IPQrk4sLVKyTf6Kk hW+Ewse4xDLffgHi4AaWPVrbe1dkjjccBli5m/nYlOJsmF8fH5yzCf4CUl6A3oNf3l33zjqF/55 B0nKZUWSwyb+1GKNAsUnH90hVeZsJdapkx/QAdyXUitPUrGWQlQ== X-Received: by 2002:a05:6214:29cc:b0:66d:4191:91ee with SMTP id gh12-20020a05621429cc00b0066d419191eemr285047qvb.51.1697662071355; Wed, 18 Oct 2023 13:47:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEkNzmUvy5H1bxPUj0OcNIgFajdhIr2DRYnhXnAt4/ZwPDEuInHEknymGdujTKOl3Wgn/sW0Q== X-Received: by 2002:a05:6214:29cc:b0:66d:4191:91ee with SMTP id gh12-20020a05621429cc00b0066d419191eemr285037qvb.51.1697662071075; 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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 13:47:50 -0700 (PDT) From: John Cabaj To: kernel-team@lists.ubuntu.com Subject: [SRU][lunar:linux-gcp][PATCH 1/1] UBUNTU: [Config] gcp: Inherit CONFIG_SYSFB_SIMPLEFB from master Date: Wed, 18 Oct 2023 15:47:46 -0500 Message-Id: <20231018204747.208180-3-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 af6a224c4d95..eccc167fbbeb 100644 --- a/debian.gcp/config/annotations +++ b/debian.gcp/config/annotations @@ -294,7 +294,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'}>