From: Arkadiusz Miƛkiewicz Date: Thu, 9 Dec 2021 08:14:55 +0000 (+0100) Subject: Up to 4.9.292. X-Git-Tag: auto/th/kernel-4.9-4.9.292-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=7f72b0a6d540e89770af2371df1c20973cc3d091;p=packages%2Fkernel.git Up to 4.9.292. --- diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch index 05fc76ac..77de74cb 100644 --- a/kernel-vserver-2.3.patch +++ b/kernel-vserver-2.3.patch @@ -12853,7 +12853,7 @@ diff -urNp -x '*.orig' linux-4.9/ipc/shm.c linux-4.9/ipc/shm.c + vx_ipcshm_sub(vxi, shp, numpages); + ns->shm_tot -= numpages; + - shm_rmid(ns, shp); + shm_rmid(shp); shm_unlock(shp); if (!is_file_hugepages(shm_file)) @@ -246,6 +252,7 @@ static void shm_destroy(struct ipc_names diff --git a/kernel.spec b/kernel.spec index 943e2a50..a69d32fd 100644 --- a/kernel.spec +++ b/kernel.spec @@ -73,7 +73,7 @@ %define rel 1 %define basever 4.9 -%define postver .291 +%define postver .292 # define this to '-%{basever}' for longterm branch %define versuffix -%{basever} @@ -125,7 +125,7 @@ Source0: https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz # Source0-md5: 0a68ef3615c64bd5ee54a3320e46667d %if "%{postver}" != ".0" Patch0: https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz -# Patch0-md5: 07e7ce555052fcba1eb2784965aeb3cf +# Patch0-md5: 416ad8c633c998415799e45a250afd1a %endif Source1: kernel.sysconfig