bump version to 5.4.140-1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/Makefile b/Makefile
index 33f295527e5ea393bb328724a78f6c3d0bc2fa0e..aa149c3aed54561c1310faba80f4915b1bb12f30 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 # also bump pve-kernel-meta if either of MAJ.MIN, PATCHLEVEL or KREL change
 KERNEL_MAJ=5
 KERNEL_MIN=4
-KERNEL_PATCHLEVEL=128
+KERNEL_PATCHLEVEL=140
 # increment KREL if the ABI changes (abicheck target in debian/rules)
 # rebuild packages with new KREL and run 'make abiupdate'
 KREL=1
 
-PKGREL=2
+PKGREL=1
 
 KERNEL_MAJMIN=$(KERNEL_MAJ).$(KERNEL_MIN)
 KERNEL_VER=$(KERNEL_MAJMIN).$(KERNEL_PATCHLEVEL)

diff --git a/debian/changelog b/debian/changelog
index ca6e06bb3cddbf489ec4cb6e7a773f52f11d2157..097da3ecca11f3958e83a9c3f89c6e6fcb19b488 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+pve-kernel (5.4.140-1) buster; urgency=medium
+
+  * update sources to 5.4.140 stable release based on Ubuntu-5.4.0-85.95
+
+  * ZFS: cherry-pick revert of "Consolidate arc_buf allocation checks" (ZFS GH
+    issue #11531)
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 08 Sep 2021 16:21:59 +0200
+
 pve-kernel (5.4.128-2) buster; urgency=medium
 
   * cherry-pick fixes for CVE-2021-3656 and CVE-2021-3653