UBUNTU: [Config] updateconfigs following 5.14-rc2 rebase

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 94cb9c5155fef93fe8a46c6b306bd4806dc2d5b1..3a902d79875168a1aefffda1c95e40e70b1f6785 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -1667,7 +1667,7 @@ CONFIG_EDAC_SBRIDGE                             policy<{'amd64': 'm'}>
 CONFIG_EDAC_SKX                                 policy<{'amd64': 'm'}>
 CONFIG_EDAC_I10NM                               policy<{'amd64': 'm'}>
 CONFIG_EDAC_PND2                                policy<{'amd64': 'm'}>
-CONFIG_EDAC_IGEN6                               policy<{'amd64': '-'}>
+CONFIG_EDAC_IGEN6                               policy<{'amd64': 'm'}>
 CONFIG_EDAC_LAYERSCAPE                          policy<{'arm64': 'm'}>
 CONFIG_EDAC_CPC925                              policy<{'ppc64el': 'm'}>
 CONFIG_EDAC_HIGHBANK_MC                         policy<{'armhf': 'm'}>
@@ -5795,7 +5795,6 @@ CONFIG_ATM_ENI_TUNE_BURST                       policy<{'amd64': 'n', 'arm64': '
 # Menu: Device Drivers >> Network device support >> CAIF transport drivers
 CONFIG_CAIF_DRIVERS                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>
 CONFIG_CAIF_TTY                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
-CONFIG_CAIF_HSI                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_CAIF_VIRTIO                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 
 # Menu: Device Drivers >> Network device support >> Distributed Switch Architecture drivers
@@ -6210,7 +6209,7 @@ CONFIG_ENC28J60                                 policy<{'amd64': 'm', 'arm64': '
 CONFIG_ENC28J60_WRITEVERIFY                     policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n'}>
 CONFIG_ENCX24J600                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_LAN743X                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
-CONFIG_SPARX5_SWITCH                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
+CONFIG_SPARX5_SWITCH                            policy<{'amd64': '-', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 
 # Menu: Device Drivers >> Network device support >> Ethernet driver support >> National Semiconductor 8390 devices
 CONFIG_NET_VENDOR_8390                          policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>
@@ -7173,7 +7172,7 @@ CONFIG_PHY_MTK_UFS                              policy<{'arm64': 'm', 'armhf': '
 CONFIG_PHY_MTK_XSPHY                            policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_PHY_MTK_HDMI                             policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_PHY_MTK_MIPI_DSI                         policy<{'arm64': 'm', 'armhf': 'm'}>
-CONFIG_PHY_SPARX5_SERDES                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
+CONFIG_PHY_SPARX5_SERDES                        policy<{'amd64': '-', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_PHY_CPCAP_USB                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_PHY_MAPPHONE_MDM6600                     policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_PHY_OCELOT_SERDES                        policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
@@ -11504,7 +11503,7 @@ CONFIG_UNWINDER_FRAME_POINTER                   mark<ENFORCED> note<needed for l
 
 # Menu: Kernel hacking >> $(SRCARCH) Debugging >> Choose kernel unwinder >> Architecture: x86
 CONFIG_UNWINDER_ORC                             policy<{'amd64': 'n'}>
-CONFIG_UNWINDER_GUESS                           policy<{'amd64': '-'}>
+CONFIG_UNWINDER_GUESS                           policy<{'amd64': 'n'}>
 
 # Menu: Kernel hacking >> $(SRCARCH) Debugging >> CoreSight Tracing Support
 CONFIG_CORESIGHT                                policy<{'arm64': 'n', 'armhf': 'n'}>
@@ -11939,7 +11938,6 @@ CONFIG_DMA_MAP_BENCHMARK                        policy<{'amd64': 'n', 'arm64': '
 CONFIG_CPUMASK_OFFSTACK                         policy<{'amd64': 'y'}>
 CONFIG_GLOB_SELFTEST                            policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_IRQ_POLL                                 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_STACK_HASH_ORDER                         policy<{'amd64': '20', 'arm64': '20', 'armhf': '20', 'ppc64el': '20', 's390x': '20'}>
 CONFIG_PARMAN                                   policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_OBJAGG                                   policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_STRING_SELFTEST                          policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 44eebd42c6f9f1a74210d26ae0988264f25c777a..eb929de0400c126a9ac49391e34f9d5709d44f39 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1406,7 +1406,6 @@ CONFIG_CACHE_TAUROS2=y
 CONFIG_CACHE_UNIPHIER=y
 # CONFIG_CAIF_DEBUG is not set
 CONFIG_CAIF_DRIVERS=y
-CONFIG_CAIF_HSI=m
 CONFIG_CAIF_NETDEV=m
 CONFIG_CAIF_TTY=m
 CONFIG_CAIF_USB=m
@@ -3315,6 +3314,7 @@ CONFIG_EDAC_I7300=m
 CONFIG_EDAC_I7CORE=m
 CONFIG_EDAC_I82975X=m
 CONFIG_EDAC_IE31200=m
+CONFIG_EDAC_IGEN6=m
 CONFIG_EDAC_LAYERSCAPE=m
 # CONFIG_EDAC_LEGACY_SYSFS is not set
 CONFIG_EDAC_PND2=m
@@ -6645,6 +6645,7 @@ CONFIG_NATSEMI=m
 CONFIG_NAU7802=m
 CONFIG_NBPFAXI_DMA=m
 CONFIG_NCSI_OEM_CMD_GET_MAC=y
+# CONFIG_NCSI_OEM_CMD_KEEP_PHY is not set
 CONFIG_NDC_DIS_DYNAMIC_CACHING=y
 CONFIG_ND_BLK=m
 CONFIG_ND_BTT=m
@@ -10653,14 +10654,12 @@ CONFIG_SSB_SDIOHOST_POSSIBLE=y
 CONFIG_SSB_SPROM=y
 CONFIG_SSFDC=m
 CONFIG_SSI_PROTOCOL=m
-CONFIG_STACKDEPOT=y
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR_PER_TASK=y
 CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_STACKTRACE=y
 # CONFIG_STACKTRACE_BUILD_ID is not set
 CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_STACK_HASH_ORDER=20
 CONFIG_STACK_TRACER=y
 CONFIG_STACK_VALIDATION=y
 # CONFIG_STAGING_BOARD is not set
@@ -11350,6 +11349,7 @@ CONFIG_UNIX_DIAG=m
 CONFIG_UNIX_SCM=y
 CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_UNWINDER_FRAME_POINTER=y
+# CONFIG_UNWINDER_GUESS is not set
 # CONFIG_UNWINDER_ORC is not set
 CONFIG_UPROBES=y
 CONFIG_UPROBE_EVENTS=y