[lkml]   [2017]   [Nov]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the rseq tree with Linus' tree
Hi Mathieu,

Today's linux-next merge of the rseq tree got a conflict in:


between commit:

7863406143d8 ("sched/isolation: Move housekeeping related code to its own file")

from Linus' tree and commit:

533bd7403b04 ("x86: Introduce sync_core_before_usermode (v2)")

from the rseq tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

Stephen Rothwell

diff --cc kernel/sched/core.c
index c85dfb746f8c,43099a091742..000000000000
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@@ -27,7 -26,7 +27,8 @@@
#include <linux/profile.h>
#include <linux/security.h>
#include <linux/syscalls.h>
+#include <linux/sched/isolation.h>
+ #include <linux/processor.h>

#include <asm/switch_to.h>
#include <asm/tlb.h>

 \ /
  Last update: 2017-11-15 05:36    [W:0.061 / U:0.280 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site