UBUNTU: Ubuntu-4.10.0-10.12

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

diff --git a/debian.master/changelog b/debian.master/changelog
index 4ce3658e6e45bcc25c23b3cf271976e8a7a0938e..6855aee8164177f05b7a21b2bce8d098a7728db1 100644 (file)
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -1,8 +1,62 @@
-linux (4.10.0-10.12) UNRELEASED; urgency=low
+linux (4.10.0-10.12) zesty; 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: #1666636
+
+  * POWER9 : Enable Stop 0-2 with ESL=EC=0 (LP: #1666197)
+    - powernv:idle: Add IDLE_STATE_ENTER_SEQ_NORET macro
+    - powernv:stop: Rename pnv_arch300_idle_init to pnv_power9_idle_init
+    - cpuidle:powernv: Add helper function to populate powernv idle states.
+    - powernv: Pass PSSCR value and mask to power9_idle_stop
+    - Documentation:powerpc: Add device-tree bindings for power-mgt
+
+  * ecryptfs fails to load block cipher on ppc64el  (LP: #1666483)
+    - [Config] CONFIG_CRYPTO_DEV_VMX=n
+
+  * [ubuntu 16.10] Enable OPTPROBES for powerpc (LP: #1585741)
+    - powerpc/bpf: Introduce __PPC_SH64()
+    - powerpc: Add helper to check if offset is within relative branch range
+    - powerpc/kprobes: Fixes for kprobe_lookup_name() on BE
+    - powerpc/kprobes: Implement Optprobes
+    - powerpc/kprobes: Optimize kprobe in kretprobe_trampoline()
+
+  * Miscellaneous Ubuntu changes
+    - [Config] CONFIG_QCOM_IRQ_COMBINER=y
+    - [Config] CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y
+    - [Config] CONFIG_HISILICON_ERRATUM_161010101=y
+
+  * Miscellaneous upstream changes
+    - ACPI: Generic GSI: Do not attempt to map non-GSI IRQs during bus scan
+    - ACPI: Add support for ResourceSource/IRQ domain mapping
+    - irqchip/qcom: Add IRQ combiner driver
+    - clocksource/drivers/arm_arch_timer: Add dt binding for hisilicon-161010101 erratum
+    - clocksource/drivers/arm_arch_timer: Remove fsl-a008585 parameter
+    - clocksource/drivers/arm_arch_timer: Introduce generic errata handling infrastructure
+    - clocksource/drivers/arm_arch_timer: Work around Hisilicon erratum 161010101
+    - iommu/dma: Allow MSI-only cookies
+    - iommu: Rename iommu_dm_regions into iommu_resv_regions
+    - iommu: Add a new type field in iommu_resv_region
+    - iommu: iommu_alloc_resv_region
+    - iommu: Only map direct mapped regions
+    - iommu: iommu_get_group_resv_regions
+    - iommu: Implement reserved_regions iommu-group sysfs file
+    - iommu/vt-d: Implement reserved region get/put callbacks
+    - iommu/amd: Declare MSI and HT regions as reserved IOVA regions
+    - iommu/arm-smmu: Implement reserved region get/put callbacks
+    - iommu/arm-smmu-v3: Implement reserved region get/put callbacks
+    - irqdomain: Add irq domain MSI and MSI_REMAP flags
+    - genirq/msi: Set IRQ_DOMAIN_FLAG_MSI on MSI domain creation
+    - irqdomain: irq_domain_check_msi_remap
+    - irqchip/gicv3-its: Sets IRQ_DOMAIN_FLAG_MSI_REMAP
+    - vfio/type1: Allow transparent MSI IOVA allocation
+    - vfio/type1: Check MSI remapping at irq domain level
+    - iommu/arm-smmu: Do not advertise IOMMU_CAP_INTR_REMAP anymore
+    - iommu/arm-smmu-v3: Clear prior settings when updating STEs
+    - iommu/arm-smmu-v3: limit use of 2-level stream tables
+    - iommu/arm-smmu: Support for Extended Stream ID (16 bit)
+    - iommu/arm-smmu: Fix for ThunderX erratum #27704
 
  -- Tim Gardner <tim.gardner@canonical.com>  Mon, 20 Feb 2017 15:32:54 -0700
 

diff --git a/debian.master/reconstruct b/debian.master/reconstruct
index 5438ffcddccc6ed961920d96c152c902fc1366ee..9e1c23f23bfb8d4ffd4468b18535f0f8a08672e4 100644 (file)
--- a/debian.master/reconstruct
+++ b/debian.master/reconstruct
@@ -6,6 +6,7 @@
 [ ! -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 'drivers/acpi/gsi.c'
 rm -f 'firmware/acenic/tg1.bin.ihex'
 rm -f 'firmware/acenic/tg2.bin.ihex'
 rm -f 'firmware/adaptec/starfire_rx.bin.ihex'