- up to 4.1.43

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index ebabd97701c8ccd70c75401f5de3c82883c37bee..5f98a8cd23d9aa3ad802229b6ba76e4c0a49e4e8 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -2,6 +2,9 @@
 # LATEST VERSION CHECKER:
 # # curl -s https://www.kernel.org/finger_banner
 #
+# PENDING STABLE PATCHES:
+# https://git.kernel.org/cgit/linux/kernel/git/sashal/linux-stable.git/log/?h=linux-4.1.y-queue
+#
 # TODO:
 # - benchmark NO_HZ & HZ=1000 vs HZ=300 on i686
 # - IPv4 source address selection for multihomed vservers is completely broken
@@ -25,7 +28,6 @@
 %bcond_with    fbcondecor      # build fbcondecor (disable FB_TILEBLITTING and affected fb modules)
 %bcond_without pae             # build PAE (HIGHMEM64G) support on 32bit i686 athlon pentium3 pentium4
 %bcond_with    nfsroot         # build with root on NFS support
-%bcond_with    uksm            # build with UKSM patch, http://kerneldedup.org/projects/uksm/
 
 %bcond_without imq             # imq support
 %bcond_without esfq            # esfq support
@@ -71,7 +73,7 @@
 
 %define                rel             1
 %define                basever         4.1
-%define                postver         .24
+%define                postver         .43
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       -%{basever}
@@ -120,7 +122,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
 # Source0-md5: fe9dc0f6729f36400ea81aa41d614c37
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:  a447fd6531a028cd9c1bc16aa73f7fb8
+# Patch0-md5:  00bc1fc04761d8041cf552d39bac196c
 %endif
 Source1:       kernel.sysconfig
 
@@ -144,7 +146,6 @@ Source41:   kernel-patches.config
 Source43:      kernel-vserver.config
 
 Source55:      kernel-imq.config
-Source56:      kernel-uksm.config
 
 Source58:      kernel-inittmpfs.config
 
@@ -188,8 +189,7 @@ Patch59:    kernel-rndis_host-wm5.patch
 # http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch
 Patch85:       kernel-hostap.patch
 
-%define        vserver_patch 4.1.18-vs2.3.8.4
-# http://vserver.13thfloor.at/Experimental/patch-4.1.18-vs2.3.8.4.diff
+%define        vserver_patch 4.1.42-vs2.3.8.6
 # note there are additional patches from above url:
 # - *fix* are real fixes (we want these)
 # - *feat* are new features/tests (we don't want these)
@@ -211,17 +211,13 @@ Patch101: kernel-vserver-fixes.patch
 Patch145:      kernel-aufs4.patch
 Patch146:      kernel-aufs4+vserver.patch
 
-%define uksm_major_version 0.1.2.3
-%define uksm_version %{uksm_major_version}-for-v3.18
-Patch150:      http://kerneldedup.org/download/uksm/%{uksm_major_version}/uksm-%{uksm_version}.patch
-# Patch150-md5:        b6a2b2aae9c2844d0c74690632d7019e
-
 # Show normal colors in menuconfig with ncurses ABI 6
 Patch250:      kernel-fix_256colors_menuconfig.patch
 
 # https://patchwork.kernel.org/patch/236261/
 Patch400:      kernel-virtio-gl-accel.patch
 
+# check for fixes: https://git.kernel.org/cgit/linux/kernel/git/sashal/linux-stable.git/log/?h=linux-4.1.y-queue
 Patch2000:     kernel-small_fixes.patch
 Patch2001:     kernel-pwc-uncompress.patch
 Patch2003:     kernel-regressions.patch
@@ -709,11 +705,6 @@ cd linux-%{basever}
 %patch146 -p1
 %endif
 
-# UKSM
-%if %{with uksm}
-%patch150 -p1
-%endif
-
 %if %{with rescuecd}
 %patch7000 -p1
 %endif
@@ -922,9 +913,6 @@ EOCONFIG
 %if %{with imq}
                %{SOURCE55} \
 %endif
-%if %{with uksm}
-               %{SOURCE56} \
-%endif
 %if %{with vserver}
                %{SOURCE43} \
 %endif