4.19.9-rc1 - 1 out of 2 hunks FAILED -- saving rejects to file fs/exec.c.rej

sirlucjan commented 5 years ago

I've compiled uksm-4.19.patch with 4.19.9-rc1 and I got an error

patching file fs/exec.c
Hunk #1 FAILED at 62.
Hunk #2 succeeded at 1380 (offset 1 line).
1 out of 2 hunks FAILED -- saving rejects to file fs/exec.c.rej

Here is exec.c.rej:

--- fs/exec.c   2018-12-08 12:59:10.000000000 +0100
+++ fs/exec.c   2018-12-08 21:30:43.629941711 +0100
@@ -62,6 +62,7 @@
 #include <linux/oom.h>
 #include <linux/compat.h>
 #include <linux/vmalloc.h>
+#include <linux/ksm.h>

 #include <linux/uaccess.h>
 #include <asm/mmu_context.h>

I've rebased patch against 4.19.9-rc1 and it seems to be OK:

--- a/fs/exec.c 2018-12-08 12:59:10.000000000 +0100
+++ b/fs/exec.c 2018-12-08 21:30:43.629941711 +0100
@@ -62,6 +62,7 @@
 #include <linux/oom.h>
 #include <linux/compat.h>
 #include <linux/vmalloc.h>
 #include <linux/freezer.h>
+#include <linux/ksm.h>

 #include <linux/uaccess.h>
 #include <asm/mmu_context.h>

Best regrads / Pozdrawiam :) Piotr

sirlucjan commented 5 years ago

Patch:

https://github.com/sirlucjan/kernel-patches/blob/master/4.19/uksm-lucjan/uksm-4.19.9-rc.patch

sirlucjan commented 5 years ago

Greg has removed commit: https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=4c31f606580ad88954d395a22a65a79a93e141c1

dolohow / uksm

4.19.9-rc1 - 1 out of 2 hunks FAILED -- saving rejects to file fs/exec.c.rej #39