[bionic/linux-gcp][PATCH 4/5] UBUNTU: [Config] linux-gcp: Include master annotations to linux-gcp annotations

Marcelo Henrique Cerri marcelo.cerri at canonical.com
Thu Feb 28 16:15:10 UTC 2019


BugLink: http://bugs.launchpad.net/bugs/1752072

Use the new include directive to inherit and overwrite the master
kernel annotations files.

Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri at canonical.com>
---
 debian.gcp/config/annotations | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian.gcp/config/annotations b/debian.gcp/config/annotations
index 6bbd2cbc22f5..428807c9ec1e 100644
--- a/debian.gcp/config/annotations
+++ b/debian.gcp/config/annotations
@@ -1,7 +1,9 @@
 # Menu: HEADER
-# FORMAT: 2
+# FORMAT: 3
 # ARCH: x86
 
+include "../../debian.master/config/annotations"
+
 # Menu: Device Drivers >> PTP clock support
 CONFIG_DP83640_PHY                              policy<{'amd64': 'n'}>
 #
-- 
2.17.1




More information about the kernel-team mailing list