- 4.9.313

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 62a32134bf6d78c85f35f98f3720ce1cb44347bb..0449a72476d7f226d7a0e25cc7e02b9167128403 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -515,6 +515,7 @@ BCMA_DEBUG all=n
 BLK_DEV all=y
 BLK_DEV_NULL_BLK all=m
 BLK_DEV_FD all=m sparc=y
+BLK_DEV_FD_RAWCMD all=y
 MAC_FLOPPY ppc=m
 PARIDE all=m
 #- file drivers/block/paride/Kconfig goes here

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index f24eee7164e5b8419d4fe471bce02aab8fb15d44..1fde01e0efda37155bee02280190d1e4c8c5e1a9 100644 (file)
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -1126,9 +1126,9 @@ diff -urNp -x '*.orig' linux-4.9/drivers/md/dm-ioctl.c linux-4.9/drivers/md/dm-i
 --- linux-4.9/drivers/md/dm-ioctl.c    2021-02-24 15:47:31.450649498 +0100
 +++ linux-4.9/drivers/md/dm-ioctl.c    2021-02-24 15:47:45.051074969 +0100
 @@ -16,6 +16,7 @@
- #include <linux/dm-ioctl.h>
  #include <linux/hdreg.h>
  #include <linux/compat.h>
+ #include <linux/nospec.h>
 +#include <linux/vs_context.h>
  
  #include <asm/uaccess.h>

diff --git a/kernel.spec b/kernel.spec
index 1b403acd5a4737ac8f27e5ad9203f020addcc4e5..a4de9c004dda7dd4c5f90e786d61b4ee6ecbb041 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -73,7 +73,7 @@
 
 %define                rel             1
 %define                basever         4.9
-%define                postver         .309
+%define                postver         .313
 
 # 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:  f6543693793209202831577ef0c7583b
+# Patch0-md5:  54039ec4bccf834a7fc7c13a8307432a
 %endif
 Source1:       kernel.sysconfig