Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> writes: > 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. It looks reasonable. Thanks. Eric -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html