UBUNTU: Ubuntu-4.4.0-1010.10

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.snapdragon/changelog b/debian.snapdragon/changelog
index cec13a87f1e97b27e0c0074a096f09b56860372f..a6fe1995346cbf1535fa7ec8c3f77414f8a845d9 100644 (file)
--- a/debian.snapdragon/changelog
+++ b/debian.snapdragon/changelog
@@ -1,8 +1,14 @@
-linux-snapdragon (4.4.0-1010.10) UNRELEASED; urgency=low
+linux-snapdragon (4.4.0-1010.10) xenial; 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.
+  [ Tim Gardner ]
+
+  * Release Tracking Bug
+    - LP: #1563910
+  * Rebase to Ubuntu-4.4.0-17.33
+
+  * Miscellaneous Ubuntu changes
+    - handle rprovides via dpkg-gencontrol
+    - [Config] updateconfigs after rebase to Ubuntu-4.4.0-17.33
 
  -- Tim Gardner <tim.gardner@canonical.com>  Wed, 30 Mar 2016 08:30:18 -0600
 

diff --git a/debian.snapdragon/reconstruct b/debian.snapdragon/reconstruct
index fc59284097a3f3f0cf1763ff12b482b6bfe73b68..e4de022be4e65dc6e3961e07074f1e1fca309659 100644 (file)
--- a/debian.snapdragon/reconstruct
+++ b/debian.snapdragon/reconstruct
@@ -14,6 +14,31 @@
 [ ! -L 'zfs/scripts/zpios-test/small.sh' ] && ln -sf '4th-1024rc-4rs-1cs-4off.sh' 'zfs/scripts/zpios-test/small.sh'
 [ ! -L 'zfs/scripts/zpios-test/tiny.sh' ] && ln -sf '1th-16rc-4rs-1cs-4off.sh' 'zfs/scripts/zpios-test/tiny.sh'
 # Remove any files deleted from the orig.
+rm -f 'arch/x86/kernel/cpu/intel_pt.h'
+rm -f 'arch/x86/kernel/cpu/perf_event.c'
+rm -f 'arch/x86/kernel/cpu/perf_event.h'
+rm -f 'arch/x86/kernel/cpu/perf_event_amd.c'
+rm -f 'arch/x86/kernel/cpu/perf_event_amd_ibs.c'
+rm -f 'arch/x86/kernel/cpu/perf_event_amd_iommu.c'
+rm -f 'arch/x86/kernel/cpu/perf_event_amd_iommu.h'
+rm -f 'arch/x86/kernel/cpu/perf_event_amd_uncore.c'
+rm -f 'arch/x86/kernel/cpu/perf_event_intel.c'
+rm -f 'arch/x86/kernel/cpu/perf_event_intel_bts.c'
+rm -f 'arch/x86/kernel/cpu/perf_event_intel_cqm.c'
+rm -f 'arch/x86/kernel/cpu/perf_event_intel_cstate.c'
+rm -f 'arch/x86/kernel/cpu/perf_event_intel_ds.c'
+rm -f 'arch/x86/kernel/cpu/perf_event_intel_lbr.c'
+rm -f 'arch/x86/kernel/cpu/perf_event_intel_pt.c'
+rm -f 'arch/x86/kernel/cpu/perf_event_intel_rapl.c'
+rm -f 'arch/x86/kernel/cpu/perf_event_intel_uncore.c'
+rm -f 'arch/x86/kernel/cpu/perf_event_intel_uncore.h'
+rm -f 'arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c'
+rm -f 'arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c'
+rm -f 'arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c'
+rm -f 'arch/x86/kernel/cpu/perf_event_knc.c'
+rm -f 'arch/x86/kernel/cpu/perf_event_msr.c'
+rm -f 'arch/x86/kernel/cpu/perf_event_p4.c'
+rm -f 'arch/x86/kernel/cpu/perf_event_p6.c'
 rm -f 'drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.h'
 rm -f 'drivers/gpu/drm/amd/amdgpu/cz_ppsmc.h'
 rm -f 'drivers/gpu/drm/amd/amdgpu/fiji_ppsmc.h'