From ec0c62cb1387ade36a66c246845f3f6bc86f0f83 Mon Sep 17 00:00:00 2001
From: Andrea Righi <andrea.righi@canonical.com>
Date: Mon, 1 Aug 2022 09:05:44 +0200
Subject: [PATCH] UBUNTU: [Config] update configs/annotations after rebase to
 5.19

c653c591789b ("drm/amdgpu: Re-enable DCN for 64-bit powerpc") introduced
CONFIG_PPC_LONG_DOUBLE_128, make sure to add that to the config.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
---
 debian.master/config/amd64/config.common.amd64 | 2 +-
 debian.master/config/annotations               | 1 -
 debian.master/config/config.common.ubuntu      | 7 ++++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index fbfc12054b03..257ffb67e9c1 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -59,7 +59,7 @@ CONFIG_CADENCE_WATCHDOG=m
 CONFIG_CAIF=m
 CONFIG_CAN=m
 CONFIG_CB710_CORE=m
-CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 11.3.0-3ubuntu1) 11.3.0"
+CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 11.3.0-5ubuntu1) 11.3.0"
 CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CMA is not set
 CONFIG_CMDLINE_PARTITION=y
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 0d7a74dc4811..0b4ca95ff993 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -2230,7 +2230,6 @@ CONFIG_DRM_AMD_DC                               policy<{'amd64': 'y', 'arm64': '
 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': 'y'}>
 CONFIG_DEBUG_KERNEL_DC                          policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n'}>
-CONFIG_DRM_AMD_SECURE_DISPLAY                   policy<{'amd64': 'y'}>
 
 # Menu: Device Drivers >> Graphics support >> Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) >> DRM Support for Allwinner A10 Display Engine
 CONFIG_DRM_SUN4I                                policy<{'arm64': 'm', 'armhf': '-'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 0f67919b0d07..15d6ba331d21 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -928,7 +928,7 @@ CONFIG_AS_IS_GNU=y
 CONFIG_AS_SHA1_NI=y
 CONFIG_AS_SHA256_NI=y
 CONFIG_AS_TPAUSE=y
-CONFIG_AS_VERSION=23800
+CONFIG_AS_VERSION=23890
 CONFIG_AS_VFP_VMRS_FPINST=y
 CONFIG_AT76C50X_USB=m
 CONFIG_AT803X_PHY=m
@@ -5842,7 +5842,7 @@ CONFIG_LDISC_AUTOLOAD=y
 # CONFIG_LD_HEAD_STUB_CATCH is not set
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_ORPHAN_WARN=y
-CONFIG_LD_VERSION=23800
+CONFIG_LD_VERSION=23890
 CONFIG_LEDS_88PM860X=m
 CONFIG_LEDS_AAEON=m
 CONFIG_LEDS_AAT1290=m
@@ -7727,7 +7727,7 @@ CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
 # CONFIG_PAGE_TABLE_CHECK is not set
 CONFIG_PAGE_TABLE_ISOLATION=y
 CONFIG_PAHOLE_HAS_SPLIT_BTF=y
-CONFIG_PAHOLE_VERSION=122
+CONFIG_PAHOLE_VERSION=123
 CONFIG_PALMAS_GPADC=m
 CONFIG_PANASONIC_LAPTOP=m
 CONFIG_PANEL=m
@@ -8498,6 +8498,7 @@ CONFIG_PPC_INDIRECT_PIO=y
 CONFIG_PPC_KUAP=y
 # CONFIG_PPC_KUAP_DEBUG is not set
 CONFIG_PPC_KUEP=y
+CONFIG_PPC_LONG_DOUBLE_128=y
 CONFIG_PPC_MEMTRACE=y
 # CONFIG_PPC_MEM_KEYS is not set
 CONFIG_PPC_MSI_BITMAP=y