Linux源码 哪个版本,有没有办法将不同版本的linux源码合并

该楼层疑似违规已被系统折叠 隐藏此楼查看此楼

好像可以用patch命令来更新源码，但我运行patch -p1 < /home/patch/patch-4.4.196-rc1出现以下提示：

patching file Makefile

Hunk #1 FAILED at 1.

1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej

patching file arch/arm/mm/fault.c

Reversed (or previously applied) patch detected! Assume -R?

这是patch-4.4.196-rc1开头的内容：

diff --git a/Makefile b/Makefile

index 721fa569a680..74857b56e08a 100644

--- a/Makefile

+++ b/Makefile

@@ -1,7 +1,7 @@

VERSION = 4

PATCHLEVEL = 4

-SUBLEVEL = 195

-EXTRAVERSION =

+SUBLEVEL = 196

+EXTRAVERSION = -rc1

NAME = Blurry Fish Butt

# *DOCUMENTATION*

diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c

index 0d20cd594017..702a5542b11a 100644

--- a/arch/arm/mm/fault.c

+++ b/arch/arm/mm/fault.c

@@ -211,7 +211,7 @@ static inline bool access_error(unsigned int fsr, struct vm_area_struct *vma)

{

unsigned int mask = VM_READ | VM_WRITE | VM_EXEC;

- if (fsr & FSR_WRITE)

+ if ((fsr & FSR_WRITE) && !(fsr & FSR_CM))

mask = VM_WRITE;

if (fsr & FSR_LNX_PF)

mask = VM_EXEC;

@@ -281,7 +281,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)

if (user_mode(regs))

flags |= FAULT_FLAG_USER;

- if (fsr & FSR_WRITE)

+ if ((fsr & FSR_WRITE) && !(fsr & FSR_CM))

flags |= FAULT_FLAG_WRITE;