DLPX-87970 Move Delphix annotations to linux-pkg to reduce merge conf…

…licts (#48) PR URL: https://www.github.com/delphix/linux-kernel-aws/pull/48
delphix · Oct 21, 2023 · c31b608 · c31b608
1 parent ba1d65a
commit c31b608
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 231 deletions.
diff --git a/debian.aws-5.15/config/annotations b/debian.aws-5.15/config/annotations
@@ -49,4 +49,3 @@ CONFIG_PAHOLE_VERSION                           policy<{'amd64': '121', 'arm64':
 CONFIG_SLS                                      policy<{'amd64': '-'}>
 CONFIG_ZERO_CALL_USED_REGS                      policy<{'amd64': '-', 'arm64': '-'}>
 
-include "../../debian.delphix/config/annotations"
diff --git a/debian.delphix/config/annotations b/debian.delphix/config/annotations
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,4 +49,3 @@ CONFIG_PAHOLE_VERSION policy<{'amd64': '121', 'arm64':
		CONFIG_SLS policy<{'amd64': '-'}>
		CONFIG_ZERO_CALL_USED_REGS policy<{'amd64': '-', 'arm64': '-'}>

		include "../../debian.delphix/config/annotations"