Merge branch 'rperier-guest/linux-master'

2018-07-25 11:40:26 +08:00 · 2018-07-25 11:40:26 +08:00 · cee76dcc13
parent 2cc158bdb7 497ccc0811
commit cee76dcc13
6 changed files with 19 additions and 3 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,7 +1,12 @@
 linux (4.18~rc5-1~exp2) UNRELEASED; urgency=medium

+  [ Uwe Kleine-König ]
  * [arm64] enable RTC_DRV_PCF8563 for Odroid-C2

+  [ Romain Perier ]
+  * [armhf, arm64] add the rt featureset, which adds support for
+    PREEMPT_RT (Closes #719547)
+
 -- Uwe Kleine-König <ukleinek@debian.org>  Sat, 21 Jul 2018 16:52:01 +0200

 linux (4.18~rc5-1~exp1) experimental; urgency=medium
--- a/debian/config/arm64/defines
+++ b/debian/config/arm64/defines
@ -2,6 +2,7 @@
 kernel-arch: arm64
 featuresets:
 none
+ rt

 [build]
 debug-info: true
--- a/debian/config/arm64/rt/defines
+++ b/debian/config/arm64/rt/defines
@ -0,0 +1,3 @@
+[base]
+flavours:
+ arm64
--- a/debian/config/armhf/defines
+++ b/debian/config/armhf/defines
@ -1,7 +1,7 @@
 [base]
-flavours:
- armmp
- armmp-lpae
+featuresets:
+ none
+ rt
 kernel-arch: arm

 [build]
--- a/debian/config/armhf/none/defines
+++ b/debian/config/armhf/none/defines
@ -0,0 +1,4 @@
+[base]
+flavours:
+ armmp
+ armmp-lpae
--- a/debian/config/armhf/rt/defines
+++ b/debian/config/armhf/rt/defines
@ -0,0 +1,3 @@
+[base]
+flavours:
+ armmp