[folded-merged] treewide-decouple-cacheflushh-and-set_memoryh-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: kprobes/x86: merge fix for set_memory.h decoupling
has been removed from the -mm tree.  Its filename was
     treewide-decouple-cacheflushh-and-set_memoryh-fix.patch

This patch was dropped because it was folded into treewide-decouple-cacheflushh-and-set_memoryh.patch

------------------------------------------------------
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Subject: kprobes/x86: merge fix for set_memory.h decoupling

Link: http://lkml.kernel.org/r/20170418180903.10300fd3@xxxxxxxxxxxxxxxx
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 arch/x86/kernel/kprobes/core.c |    1 +
 arch/x86/kernel/kprobes/opt.c  |    1 +
 2 files changed, 2 insertions(+)

diff -puN arch/x86/kernel/kprobes/core.c~treewide-decouple-cacheflushh-and-set_memoryh-fix arch/x86/kernel/kprobes/core.c
--- a/arch/x86/kernel/kprobes/core.c~treewide-decouple-cacheflushh-and-set_memoryh-fix
+++ a/arch/x86/kernel/kprobes/core.c
@@ -61,6 +61,7 @@
 #include <asm/alternative.h>
 #include <asm/insn.h>
 #include <asm/debugreg.h>
+#include <asm/set_memory.h>
 
 #include "common.h"
 
diff -puN arch/x86/kernel/kprobes/opt.c~treewide-decouple-cacheflushh-and-set_memoryh-fix arch/x86/kernel/kprobes/opt.c
--- a/arch/x86/kernel/kprobes/opt.c~treewide-decouple-cacheflushh-and-set_memoryh-fix
+++ a/arch/x86/kernel/kprobes/opt.c
@@ -37,6 +37,7 @@
 #include <asm/alternative.h>
 #include <asm/insn.h>
 #include <asm/debugreg.h>
+#include <asm/set_memory.h>
 
 #include "common.h"
 
_

Patches currently in -mm which might be from sfr@xxxxxxxxxxxxxxxx are

mm-introduce-kvalloc-helpers-fix.patch
treewide-decouple-cacheflushh-and-set_memoryh.patch
gfs2-replace-current_time-with-current_time.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux