Messages in this thread | | | Date | Wed, 6 Feb 2013 12:49:25 +0100 | From | Ingo Molnar <> | Subject | Re: [GIT PULL rcu/next] RCU commits for 3.9 |
| |
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
| |