bump version to 4.15.18-21

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

diff --git a/Makefile b/Makefile
index 58616e455832f5d2b998b28d2e9e23c2a937d1b4..eaa58b1a99cc544355dda3672a0227745fb5e866 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ KERNEL_PATCHLEVEL=18
 # rebuild packages with new KREL and run 'make abiupdate'
 KREL=2
 
-PKGREL=20
+PKGREL=21
 
 KERNEL_MAJMIN=$(KERNEL_MAJ).$(KERNEL_MIN)
 KERNEL_VER=$(KERNEL_MAJMIN).$(KERNEL_PATCHLEVEL)

diff --git a/debian/changelog b/debian/changelog
index 29ae15f820aacbda2a0df8a4cc461ea6dfe12291..b148020e60dc9b67af0dec4152811d52bf3bd1c1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+pve-kernel (4.15.18-21) unstable; urgency=medium
+
+  * backport fix for udp/tcp with SO_BINDTODEVICE
+
+  * scsi: hpsa: disable device during shutdown
+
+  * vhost: fix info leak due to uninitialized memory (CVE-2018-1118)
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 23 Aug 2018 11:01:17 +0200
+
 pve-kernel (4.15.18-20) unstable; urgency=medium
 
   * update to Ubuntu-4.15.0-32.35