UBUNTU: Ubuntu-raspi2-4.13.0-1004.4

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.raspi2/changelog b/debian.raspi2/changelog
index d3b2fe69b23316cb6263e84e574e2192c79665be..c5d4f3bfe899b7be861b11766c85fea023f0d631 100644 (file)
--- a/debian.raspi2/changelog
+++ b/debian.raspi2/changelog
@@ -1,8 +1,9 @@
-linux-raspi2 (4.13.0-1004.4) UNRELEASED; urgency=low
+linux-raspi2 (4.13.0-1004.4) artful; urgency=low
 
-  CHANGELOG: Do not edit directly. Autogenerated at release.
-  CHANGELOG: Use the printchanges target to see the curent changes.
-  CHANGELOG: Use the insertchanges target to create the final log.
+  * linux-raspi2: 4.13.0-1004.4 -proposed tracker (LP: #1721562)
+
+  * Miscellaneous Ubuntu changes
+    - [Config] update configs follwing rebase to Ubuntu-4.13.0-15.16
 
   [ Ubuntu: 4.13.0-15.16 ]
 
@@ -423,7 +424,7 @@ linux-raspi2 (4.13.0-1004.4) UNRELEASED; urgency=low
   * Miscellaneous upstream changes
     - Introduce v3 namespaced file capabilities
 
- -- Seth Forshee <seth.forshee@canonical.com>  Thu, 05 Oct 2017 09:14:43 -0500
+ -- Seth Forshee <seth.forshee@canonical.com>  Thu, 05 Oct 2017 09:57:27 -0500
 
 linux-raspi2 (4.13.0-1003.3) artful; urgency=low
 

diff --git a/debian.raspi2/reconstruct b/debian.raspi2/reconstruct
index ed2e5bd39e78e3195238d978c93937d0dffd1975..e2cf6049b63643a6613eb10d3435d9b4f0d07e3e 100644 (file)
--- a/debian.raspi2/reconstruct
+++ b/debian.raspi2/reconstruct
@@ -8,6 +8,10 @@
 [ ! -L 'ubuntu/vbox/vboxvideo/include' ] && ln -sf '../include' 'ubuntu/vbox/vboxvideo/include'
 [ ! -L 'ubuntu/vbox/vboxvideo/r0drv' ] && ln -sf '../r0drv' 'ubuntu/vbox/vboxvideo/r0drv'
 # Remove any files deleted from the orig.
+rm -f 'arch/x86/events/intel/cqm.c'
+rm -f 'arch/x86/include/asm/intel_rdt.h'
+rm -f 'arch/x86/include/asm/intel_rdt_common.h'
+rm -f 'arch/x86/kernel/cpu/intel_rdt_schemata.c'
 rm -f 'firmware/acenic/tg1.bin.ihex'
 rm -f 'firmware/acenic/tg2.bin.ihex'
 rm -f 'firmware/adaptec/starfire_rx.bin.ihex'