btw., I got a non-trivial conflicts in
kernel/context_tracking.c, with the following commits
interacting between the RCU tree (tip:core/rcu) and the
scheduler tree (tip:sched/core):
6a61671bb2f3 cputime: Safely read cputime of full dynticks CPUs
abf917cd91cb cputime: Generic on-demand virtual cputime accounting
4eacdf18374e context_tracking: Add comments on interface and internals
95a79fd458b8 context_tracking: Export context state for generic vtime
I think I managed to resolve the conflicts (will push it out in
an hour or two, after some testing) - but please double check me
on it...
Thanks,
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
