lkml.org 
[lkml]   [2013]   [Feb]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [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


\
 
 \ /
  Last update: 2013-02-06 13:21    [W:3.649 / U:1.032 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site