From patchwork Wed Oct 18 20:47:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Cabaj X-Patchwork-Id: 1851221 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 4S9jcD3y0nz1ypX for ; Thu, 19 Oct 2023 07:48:27 +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-0007uy-56; Wed, 18 Oct 2023 20:48:06 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qtDSJ-0007uR-Vr for kernel-team@lists.ubuntu.com; Wed, 18 Oct 2023 20:47:52 +0000 Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.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 AEDC23F697 for ; Wed, 18 Oct 2023 20:47:51 +0000 (UTC) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-65b08994e15so1781996d6.0 for ; Wed, 18 Oct 2023 13:47:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697662070; x=1698266870; 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=Vg8BFZStcI0iB90xmkuCJyRR3lHx/fDPBEwX+NnHyIc=; b=vlJ+c5IgnC/F6o569VFkrKrEkuonWU2ykjZ0zDkz86wbn/aaXhND3Hz6Ybz7EQypQE 4xUHwwMMXyfu2L7EtLe+QOjaQmS9WJzZ/YWZt95xTVXa+5n2pLrcEbHUhDj3hEM1q6cL H+oFp2Th4lu86eg6lvpS04LyVM2EtBt2wM4lBoP2bjTa2dbvR2X1IY3FeyQ7DRj/cBgl LnLC45MOAfuzXCDdITnzl6d0vvlvw4SazSIkQgG+ni/Vd5yGrIqarZiSC8NP15kFCF9U aNANTIdR6zGG4bixTK39JivWHFNzOfJ9zw+eaw4AX6X2iCH0KAZMpkuPYdmOYrx0++bK sN1A== X-Gm-Message-State: AOJu0YzXYRzRXP13XJXjhZEQ8UgQJ68ray10/dDw5WkgoqjccGmtdSx3 bJkJWi2thzf8sUGB2j6chmh/b8shRtp5fNN7BY/LW0I4vfJ0m9Aiwi9xzcETTmSAf1Vo+MGRL8I 97QTS+q41xvce5NWdYvTm9rjwFeuKTrJsv4Rg+n0QxLj5opiXUQ== X-Received: by 2002:a05:6214:21ec:b0:66c:edbf:ee9c with SMTP id p12-20020a05621421ec00b0066cedbfee9cmr603238qvj.30.1697662070616; Wed, 18 Oct 2023 13:47:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEWKUKk7/1kfjazQlEwkZcfPzjC1pAEegYzOKzg8JAAseCzxvY1UHtOZzMeslFOKBjsIpi7SA== X-Received: by 2002:a05:6214:21ec:b0:66c:edbf:ee9c with SMTP id p12-20020a05621421ec00b0066cedbfee9cmr603228qvj.30.1697662070387; Wed, 18 Oct 2023 13:47:50 -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.49 (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][jammy:linux-gcp][PATCH 1/1] UBUNTU: [Config] gcp: Inherit CONFIG_SYSFB_SIMPLEFB from master Date: Wed, 18 Oct 2023 15:47:45 -0500 Message-Id: <20231018204747.208180-2-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 ae5799f4666a..4c281752fa0c 100644 --- a/debian.gcp/config/annotations +++ b/debian.gcp/config/annotations @@ -80,7 +80,6 @@ CONFIG_SPEAKUP_SYNTH_LTLK policy<{'amd64': '-', 'arm64': ' CONFIG_SPEAKUP_SYNTH_SOFT policy<{'amd64': '-', 'arm64': '-'}> CONFIG_SPEAKUP_SYNTH_SPKOUT policy<{'amd64': '-', 'arm64': '-'}> CONFIG_SPEAKUP_SYNTH_TXPRT policy<{'amd64': '-', 'arm64': '-'}> -CONFIG_SYSFB_SIMPLEFB policy<{'amd64': 'y', 'arm64': 'y'}> CONFIG_UBUNTU_ODM_DRIVERS policy<{'amd64': '-'}> CONFIG_VERSION_SIGNATURE policy<{'amd64': '"Ubuntu 5.15.0-22.22-generic 5.15.19"', 'arm64': '"Ubuntu 5.15.0-22.22-generic 5.15.19"'}> CONFIG_VIDEO_ADV7511_CEC policy<{'amd64': 'n'}>