lkml.org 
[lkml]   [2012]   [May]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the userns tree with the tip tree
Hi Eric,

Today's linux-next merge of the userns tree got a conflict in
include/linux/sched.h between commit 50954a1f450e ("sched/numa: Provide
sysctl knob to disable numa scheduling and turn it off by default") from
the tip tree and commit 7b44ab978b77 ("userns: Disassociate user_struct
from the user_namespace") from the userns tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc include/linux/sched.h
index 37a7cd8,5fdc1eb..0000000
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@@ -90,7 -90,7 +90,8 @@@ struct sched_param
#include <linux/latencytop.h>
#include <linux/cred.h>
#include <linux/llist.h>
+#include <linux/jump_label.h>
+ #include <linux/uidgid.h>

#include <asm/processor.h>

[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-05-21 10:21    [W:0.034 / U:0.388 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site