From aae0beffdbf30106df9f1356183856361173065e Mon Sep 17 00:00:00 2001
From: Andrea Righi <andrea.righi@canonical.com>
Date: Thu, 18 May 2023 07:34:09 +0200
Subject: [PATCH] UBUNTU: Ubuntu-unstable-6.4.0-1.1

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
---
 debian.master/changelog   | 27 ++++++++++++++++----
 debian.master/reconstruct | 54 ---------------------------------------
 2 files changed, 22 insertions(+), 59 deletions(-)

diff --git a/debian.master/changelog b/debian.master/changelog
index 78636f68d445..292315cb379c 100644
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -1,14 +1,31 @@
-linux-unstable (6.4.0-1.1) UNRELEASED; urgency=medium
+linux-unstable (6.4.0-1.1) mantic; 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.
+  * mantic/linux-unstable: 6.4.0-1.1 -proposed tracker (LP: #2019965)
+
+  * Packaging resync (LP: #1786013)
+    - [Packaging] update variants
+    - [Packaging] update helper scripts
+
+  * Kernel 6.1 bumped the disk consumption on default images by 15%
+    (LP: #2015867)
+    - [Packaging] introduce a separate linux-lib-rust package
+
+  * Miscellaneous Ubuntu changes
+    - [Config] enable CONFIG_BLK_DEV_UBLK on amd64
+    - [Packaging] annotations: use python3 in the shebang
+    - SAUCE: blk-throttle: Fix io statistics for cgroup v1
+    - [Packaging] move to v6.4 and rename to linux-unstable
+    - [Config] update annotations after rebase to v6.4-rc1
+    - [Packaging] temporarily disable perf
+    - [Packaging] temporarily disable bpftool
+    - [Config] ppc64el: reduce CONFIG_ARCH_FORCE_MAX_ORDER from 9 to 8
+    - SAUCE: perf: explicitly disable libtraceevent
 
   [ Upstream Kernel Changes ]
 
   * Rebase to v6.4-rc2
 
- -- Andrea Righi <andrea.righi@canonical.com>  Wed, 17 May 2023 15:46:49 +0200
+ -- Andrea Righi <andrea.righi@canonical.com>  Thu, 18 May 2023 07:34:09 +0200
 
 linux-unstable (6.4.0-0.0) mantic; urgency=medium
 
diff --git a/debian.master/reconstruct b/debian.master/reconstruct
index 3c52f3b9e04e..ca916d098dab 100644
--- a/debian.master/reconstruct
+++ b/debian.master/reconstruct
@@ -1,55 +1 @@
-# Recreate any symlinks created since the orig.
-# Remove any files deleted from the orig.
-rm -f 'scripts/is_rust_module.sh'
-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/checks/abi-check'
-chmod +x 'debian/scripts/checks/config-check'
-chmod +x 'debian/scripts/checks/final-checks'
-chmod +x 'debian/scripts/checks/module-check'
-chmod +x 'debian/scripts/checks/module-signature-check'
-chmod +x 'debian/scripts/checks/retpoline-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/dkms-build-configure--zfs'
-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/annotations'
-chmod +x 'debian/scripts/misc/arch-has-odm-enabled.sh'
-chmod +x 'debian/scripts/misc/find-missing-sauce.sh'
-chmod +x 'debian/scripts/misc/fw-to-ihex.sh'
-chmod +x 'debian/scripts/misc/gen-auto-reconstruct'
-chmod +x 'debian/scripts/misc/getabis'
-chmod +x 'debian/scripts/misc/git-ubuntu-log'
-chmod +x 'debian/scripts/misc/insert-changes'
-chmod +x 'debian/scripts/misc/insert-mainline-changes'
-chmod +x 'debian/scripts/misc/insert-ubuntu-changes'
-chmod +x 'debian/scripts/misc/kernelconfig'
-chmod +x 'debian/scripts/misc/migrate-annotations'
-chmod +x 'debian/scripts/misc/retag'
-chmod +x 'debian/scripts/misc/splitconfig.pl'
-chmod +x 'debian/scripts/misc/update-aufs.sh'
-chmod +x 'debian/scripts/module-inclusion'
-chmod +x 'debian/scripts/retpoline-extract'
-chmod +x 'debian/scripts/retpoline-extract-one'
-chmod +x 'debian/scripts/sign-module'
-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 'drivers/watchdog/f71808e_wdt.c'
-chmod -x 'scripts/is_rust_module.sh'
-chmod +x 'update-dkms-versions'
 exit 0