DLPX-87344 Fix kernel merge conflict with upstream

Prakash Surya · Delphix Engineering · commit dd7fad44b193 · 2023-08-28T04:28:13.000Z
diff --git a/debian.hwe-5.15/config/annotations b/debian.hwe-5.15/config/annotations
@@ -1,7 +1,7 @@
 # Menu: HEADER
 # FORMAT: 4
-# ARCH: amd64 arm64 armhf ppc64el s390x
-# FLAVOUR: amd64-generic amd64-lowlatency arm64-generic arm64-generic-64k arm64-lowlatency arm64-lowlatency-64k armhf-generic armhf-generic-lpae ppc64el-generic s390x-generic
+# ARCH: amd64
+# FLAVOUR: amd64-generic
 
 CONFIG_ACCESSIBILITY                            policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'n'}>
 CONFIG_ACCESSIBILITY                            note<'LP: #1967702'>
