From 2d6d3f15dbafa02258832330cc9eb8d1db058a3c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Sat, 13 Dec 2008 20:31:28 +0000
Subject: [PATCH] - resolve conflict with vserver and grsec

Changed files:
    kernel-regressions.patch -> 1.2
---
 kernel-regressions.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel-regressions.patch b/kernel-regressions.patch
index 7b249dd6..bd7c47f6 100644
--- a/kernel-regressions.patch
+++ b/kernel-regressions.patch
@@ -182,13 +182,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
 @@ -19,6 +19,7 @@
+ #include <linux/module.h>
+ #include <linux/security.h>
+ #include <linux/ptrace.h>
++#include <linux/smp_lock.h>
  #include <linux/signal.h>
  #include <linux/rcupdate.h>
  #include <linux/pid_namespace.h>
-+#include <linux/smp_lock.h>
- 
- #include <asm/poll.h>
- #include <asm/siginfo.h>
 @@ -175,6 +176,11 @@ static int setfl(int fd, struct file * f
  	if (error)
  		return error;
-- 
2.44.0