linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@kernel.org>
To: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
	=?unknown-8bit?B?RnLDqWTDqXJpYw==?= Weisbecker
	<fweisbec@gmail.com>
Cc: mingo@elte.hu, linux-kernel@vger.kernel.org,
	josh@joshtriplett.org, rostedt@goodmis.org, rbraun@sceen.net,
	zhong@linux.vnet.ibm.com, markus@trippelsdorf.de,
	sasha.levin@oracle.com, cody@linux.vnet.ibm.com,
	dave@linux.vnet.ibm.com, fweisbec@gmail.com,
	akpm@linux-foundation.org, tglx@linutronix.de
Subject: Re: [GIT PULL rcu/next] RCU commits for 3.9
Date: Wed, 6 Feb 2013 12:49:25 +0100	[thread overview]
Message-ID: <20130206114925.GF8696@gmail.com> (raw)
In-Reply-To: <20130205141124.GA12785@linux.vnet.ibm.com>


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

  parent reply	other threads:[~2013-02-06 11:49 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-04 17:18 [GIT PULL rcu/next] RCU commits for 3.9 Paul E. McKenney
2013-02-04 18:07 ` Ingo Molnar
2013-02-04 19:30   ` Ingo Molnar
2013-02-04 20:25     ` Paul E. McKenney
2013-02-05 14:11       ` Paul E. McKenney
2013-02-05 19:52         ` Steven Rostedt
2013-02-05 21:36           ` Paul E. McKenney
2013-02-06 11:44         ` Ingo Molnar
2013-02-06 11:49         ` Ingo Molnar [this message]
2013-02-06 15:03           ` Frederic Weisbecker
2013-02-07 11:21 ` Lai Jiangshan
2013-02-07 16:15   ` Paul E. McKenney

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130206114925.GF8696@gmail.com \
    --to=mingo@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=cody@linux.vnet.ibm.com \
    --cc=dave@linux.vnet.ibm.com \
    --cc=fweisbec@gmail.com \
    --cc=josh@joshtriplett.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=markus@trippelsdorf.de \
    --cc=mingo@elte.hu \
    --cc=paulmck@linux.vnet.ibm.com \
    --cc=rbraun@sceen.net \
    --cc=rostedt@goodmis.org \
    --cc=sasha.levin@oracle.com \
    --cc=tglx@linutronix.de \
    --cc=zhong@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).