From ea9a2a5213cd83567c14f689408e4ef7c35c3edb Mon Sep 17 00:00:00 2001
From: Timo Aaltonen <timo.aaltonen@canonical.com>
Date: Tue, 15 Dec 2020 15:46:57 +0200
Subject: [PATCH] UBUNTU: Ubuntu-oem-5.10-5.10.0-1008.9

Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
---
 debian.oem/changelog   | 38 +++++++++++++++++++++++++++-----
 debian.oem/reconstruct | 50 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+), 5 deletions(-)

diff --git a/debian.oem/changelog b/debian.oem/changelog
index acdfbf660c072..4cb9229a30b94 100644
--- a/debian.oem/changelog
+++ b/debian.oem/changelog
@@ -1,10 +1,38 @@
-linux-oem-5.10 (5.10.0-1008.9) UNRELEASED; urgency=medium
+linux-oem-5.10 (5.10.0-1008.9) focal; urgency=medium
 
-  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.
+  * focal/linux-oem-5.10: 5.10.0-1008.9 -proposed tracker (LP: #1908114)
 
- -- Timo Aaltonen <timo.aaltonen@canonical.com>  Mon, 14 Dec 2020 20:22:03 +0200
+  * Packaging resync (LP: #1786013)
+    - [Packaging] update variants
+
+  * Miscellaneous Ubuntu changes
+    - [Config] update configs and annotations after rebase to v5.10
+
+  [ Ubuntu: 5.10.0-9.10 ]
+
+  * Use INTx for Pericom USB controllers (LP: #1906839)
+    - PCI: Disable MSI for Pericom PCIe-USB adapter
+  * disable building bpf selftests (LP: #1908144)
+    - SAUCE: selftests/bpf: clarify build error if no vmlinux
+    - SAUCE: selftests: Skip BPF seftests by default
+    - disable building bpf selftests (no VMLINUX_BTF)
+  * Miscellaneous Ubuntu changes
+    - [Config] Enable CONFIG_BPF_LSM
+  * Miscellaneous upstream changes
+    - Revert "md: change mddev 'chunk_sectors' from int to unsigned"
+    - Revert "dm raid: fix discard limits for raid1 and raid10"
+
+  [ Ubuntu: 5.10.0-8.9 ]
+
+  * Packaging resync (LP: #1786013)
+    - [Packaging] update variants
+  * Fix bpf selftest compilation with clang 11
+    - bpf: Fix selftest compilation on clang 11
+  * Miscellaneous Ubuntu changes
+    - [Config] update configs and annotations after rebase to v5.10
+  * Rebase to v5.10
+
+ -- Timo Aaltonen <timo.aaltonen@canonical.com>  Tue, 15 Dec 2020 15:46:56 +0200
 
 linux-oem-5.10 (5.10.0-1007.8) focal; urgency=medium
 
diff --git a/debian.oem/reconstruct b/debian.oem/reconstruct
index ca916d098dabf..b71eaf17948f1 100644
--- a/debian.oem/reconstruct
+++ b/debian.oem/reconstruct
@@ -1 +1,51 @@
+# Recreate any symlinks created since the orig.
+# Remove any files deleted from the orig.
+chmod +x 'debian/cloud-tools/hv_get_dhcp_info'
+chmod +x 'debian/cloud-tools/hv_get_dns_info'
+chmod +x 'debian/cloud-tools/hv_set_ifconfig'
+chmod +x 'debian/rules'
+chmod +x 'debian/scripts/abi-check'
+chmod +x 'debian/scripts/config-check'
+chmod +x 'debian/scripts/control-create'
+chmod +x 'debian/scripts/dkms-build'
+chmod +x 'debian/scripts/dkms-build--nvidia-N'
+chmod +x 'debian/scripts/file-downloader'
+chmod +x 'debian/scripts/helpers/close'
+chmod +x 'debian/scripts/helpers/open'
+chmod +x 'debian/scripts/helpers/rebase'
+chmod +x 'debian/scripts/link-headers'
+chmod +x 'debian/scripts/misc/final-checks'
+chmod +x 'debian/scripts/misc/find-missing-sauce.sh'
+chmod +x 'debian/scripts/misc/find-obsolete-firmware'
+chmod +x 'debian/scripts/misc/fw-to-ihex.sh'
+chmod +x 'debian/scripts/misc/gen-auto-reconstruct'
+chmod +x 'debian/scripts/misc/get-firmware'
+chmod +x 'debian/scripts/misc/getabis'
+chmod +x 'debian/scripts/misc/git-ubuntu-log'
+chmod +x 'debian/scripts/misc/insert-changes.pl'
+chmod +x 'debian/scripts/misc/insert-mainline-changes'
+chmod +x 'debian/scripts/misc/insert-ubuntu-changes'
+chmod +x 'debian/scripts/misc/kernel-wedge-arch.pl'
+chmod +x 'debian/scripts/misc/kernelconfig'
+chmod +x 'debian/scripts/misc/retag'
+chmod +x 'debian/scripts/misc/splitconfig.pl'
+chmod +x 'debian/scripts/misc/tristate.sh'
+chmod +x 'debian/scripts/misc/update-aufs.sh'
+chmod +x 'debian/scripts/module-check'
+chmod +x 'debian/scripts/module-inclusion'
+chmod +x 'debian/scripts/retpoline-check'
+chmod +x 'debian/scripts/retpoline-extract'
+chmod +x 'debian/scripts/retpoline-extract-one'
+chmod +x 'debian/templates/extra.postinst.in'
+chmod +x 'debian/templates/extra.postrm.in'
+chmod +x 'debian/templates/headers.postinst.in'
+chmod +x 'debian/templates/image.postinst.in'
+chmod +x 'debian/templates/image.postrm.in'
+chmod +x 'debian/templates/image.preinst.in'
+chmod +x 'debian/templates/image.prerm.in'
+chmod +x 'debian/tests-build/check-aliases'
+chmod +x 'debian/tests/rebuild'
+chmod +x 'debian/tests/ubuntu-regression-suite'
+chmod +x 'scripts/kmsg-doc'
+chmod +x 'update-version-dkms'
 exit 0