From: Dietmar Maurer <dietmar@proxmox.com>
Date: Sat, 14 Mar 2015 10:48:24 +0000 (+0100)
Subject: bump version to 3.10-0-30, api version 8-pve
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5623bd4590a1dfbb0a0c05afd20a7568e639773e;p=pve-kernel-3.10.0.git

bump version to 3.10-0-30, api version 8-pve
---

diff --git a/Makefile b/Makefile
index 2f6c7ab..fea04f2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 RELEASE=4.0
 
 KERNEL_VER=3.10.0
-PKGREL=29
+PKGREL=30
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
-KREL=7
+KREL=8
 
-RHKVER=123.20.1.el7
+RHKVER=229.el7
 
 KERNELSRCRPM=kernel-${KERNEL_VER}-${RHKVER}.src.rpm
 
@@ -201,7 +201,6 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
 	#cd ${KERNEL_SRC}; patch -p1 <../fix-idr-header-for-drbd-compilation.patch
 	cd ${KERNEL_SRC}; patch -p1 <../add-empty-ndo_poll_controller-to-veth.patch
 	cd ${KERNEL_SRC}; patch -p1 <../override_for_missing_acs_capabilities.patch
-	cd ${KERNEL_SRC}; patch -p1 <../tg3-fix-deadlock_in_tg3_change_mtu.patch
 	cd ${KERNEL_SRC}; patch -p1 <../vhost-net-extend-device-allocation-to-vmalloc.patch
 	sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
 	touch $@
diff --git a/changelog.Debian b/changelog.Debian
index 49edab1..0653c6b 100644
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,11 @@
+pve-kernel-3.10.0 (3.10.0-30) unstable; urgency=medium
+
+  * update to kernel-3.10.0-229.el7.src.rpm
+  
+  * remove tg3-fix-deadlock_in_tg3_change_mtu.patch (now upstream)
+
+ -- Proxmox Support Team <support@proxmox.com>  Sat, 14 Mar 2015 10:32:36 +0100
+
 pve-kernel-3.10.0 (3.10.0-29) unstable; urgency=low
 
   * IPv6: forwaring ICMP6 neighbor solicitation on bridge