- up to 4.9.129

[packages/kernel.git] / kernel-vserver-2.3.patch

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 3689dab6ec0efccd1b70c52bbac782b11e3a1a38..8e653bf97a915d41601d2af6408a40e81c9bfc2f 100644 (file)
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -2222,15 +2222,6 @@ diff -NurpP --minimal linux-4.9.82/fs/ext2/inode.c linux-4.9.82-vs2.3.9.7/fs/ext
  #include "ext2.h"
  #include "acl.h"
  #include "xattr.h"
-@@ -1271,7 +1272,7 @@ static void ext2_truncate_blocks(struct
-               return;
-       if (ext2_inode_is_fast_symlink(inode))
-               return;
--      if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
-+      if (IS_APPEND(inode) || IS_IXORUNLINK(inode))
-               return;
- 
-       dax_sem_down_write(EXT2_I(inode));
 @@ -1367,39 +1368,61 @@ void ext2_set_inode_flags(struct inode *
  {
        unsigned int flags = EXT2_I(inode)->i_flags;
@@ -24492,9 +24483,9 @@ diff -NurpP --minimal linux-4.9.82/net/netlink/af_netlink.c linux-4.9.82-vs2.3.9
 --- linux-4.9.82/net/netlink/af_netlink.c      2018-02-22 21:19:04.000000000 +0000
 +++ linux-4.9.82-vs2.3.9.7/net/netlink/af_netlink.c    2018-01-10 02:50:49.000000000 +0000
 @@ -62,6 +62,8 @@
- #include <asm/cacheflush.h>
  #include <linux/hash.h>
  #include <linux/genetlink.h>
+ #include <linux/nospec.h>
 +#include <linux/vs_context.h>
 +#include <linux/vs_network.h>