From c04a107c55d64dd582b4fbe19b0d42db68c691d1 Mon Sep 17 00:00:00 2001 From: Prakash Surya Date: Tue, 15 Aug 2023 11:45:03 -0700 Subject: [PATCH] DLPX-87344 Fix kernel merge conflict with upstream --- debian.aws-5.15/config/annotations | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian.aws-5.15/config/annotations b/debian.aws-5.15/config/annotations index 065960d00b0e5..8d1f5a244a3c7 100644 --- a/debian.aws-5.15/config/annotations +++ b/debian.aws-5.15/config/annotations @@ -1,7 +1,7 @@ # Menu: HEADER # FORMAT: 4 -# ARCH: amd64 arm64 -# FLAVOUR: amd64-aws arm64-aws +# ARCH: amd64 +# FLAVOUR: amd64-aws include "../../debian.aws/config/annotations"