From 2c2e8219c3e01c809a252c864a091db42ad3ad02 Mon Sep 17 00:00:00 2001
From: Andrea Righi <andrea.righi@canonical.com>
Date: Mon, 28 Nov 2022 11:24:47 +0100
Subject: [PATCH] UBUNTU: [Config] udpate annotations after rebase to v6.1-rc7

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
---
 debian.master/config/annotations | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 9f86718d42ae9..95364b8e7448c 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -1686,6 +1686,7 @@ CONFIG_CCW_CONSOLE                              policy<{'s390x-generic': 'y'}>
 CONFIG_CC_CAN_LINK                              policy<{'amd64-generic': 'y', 'arm64-generic': 'y', 'arm64-generic-64k': 'y', 'armhf-generic': 'y', 'armhf-generic-lpae': 'y', 'ppc64el-generic': 'y', 'riscv64-generic': 'y', 's390x-generic': 'y'}>
 CONFIG_CC_CAN_LINK_STATIC                       policy<{'amd64-generic': 'y', 'arm64-generic': 'y', 'arm64-generic-64k': 'y', 'armhf-generic': 'y', 'armhf-generic-lpae': 'y', 'ppc64el-generic': 'y', 'riscv64-generic': 'y', 's390x-generic': 'y'}>
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT                   policy<{'amd64-generic': 'y', 'arm64-generic': 'y', 'arm64-generic-64k': 'y', 'armhf-generic': 'y', 'armhf-generic-lpae': 'y', 'ppc64el-generic': 'y', 'riscv64-generic': 'y', 's390x-generic': 'y'}>
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT              policy<{'amd64-generic': 'y', 'arm64-generic': 'y', 'arm64-generic-64k': 'y', 'armhf-generic': 'y', 'armhf-generic-lpae': 'y', 'ppc64el-generic': 'y', 'riscv64-generic': 'y', 's390x-generic': 'y'}>
 CONFIG_CC_HAS_ASM_INLINE                        policy<{'amd64-generic': 'y', 'arm64-generic': 'y', 'arm64-generic-64k': 'y', 'armhf-generic': 'y', 'armhf-generic-lpae': 'y', 'ppc64el-generic': 'y', 'riscv64-generic': 'y', 's390x-generic': 'y'}>
 CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN             policy<{'amd64-generic': 'y', 'arm64-generic': 'y', 'arm64-generic-64k': 'y', 'armhf-generic': 'y', 'armhf-generic-lpae': 'y', 'ppc64el-generic': 'y', 'riscv64-generic': 'y', 's390x-generic': 'y'}>
 CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO                policy<{'amd64-generic': 'y', 'arm64-generic': 'y', 'arm64-generic-64k': 'y', 'armhf-generic': 'y', 'armhf-generic-lpae': 'y', 'ppc64el-generic': 'y', 'riscv64-generic': 'y', 's390x-generic': 'y'}>
@@ -4222,6 +4223,7 @@ CONFIG_FPGA_DFL_FME_MGR                         policy<{'amd64': 'm', 'arm64': '
 CONFIG_FPGA_DFL_FME_REGION                      policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_FPGA_DFL_PCI                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
+CONFIG_FPGA_M10_BMC_SEC_UPDATE                  policy<{'amd64-generic': 'n', 'arm64-generic': 'n', 'arm64-generic-64k': 'n', 'armhf-generic': 'n', 'armhf-generic-lpae': 'n', 'ppc64el-generic': 'n', 'riscv64-generic': 'n'}>
 CONFIG_FPGA_MGR_ALTERA_CVP                      policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
 CONFIG_FPGA_MGR_ALTERA_PS_SPI                   policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': '-'}>
 CONFIG_FPGA_MGR_ICE40_SPI                       policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>