All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: Frederic Weisbecker <fweisbec@gmail.com>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
	Suresh Siddha <suresh.b.siddha@intel.com>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	tglx@linutronix.de, josh@joshtriplett.org, keescook@chromium.org,
	linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL rcu/next] RCU commits for 3.3
Date: Thu, 15 Dec 2011 08:06:04 +0100	[thread overview]
Message-ID: <20111215070604.GC14237@elte.hu> (raw)
In-Reply-To: <20111214174736.GF10791@somewhere.redhat.com>


* Frederic Weisbecker <fweisbec@gmail.com> wrote:

> I don't know how you plan to fix the conflict, by redoing the 
> merge or by applying a patch on tip/master.

I've re-done the merge - thanks guys!

	Ingo

      parent reply	other threads:[~2011-12-15  7:07 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20111213230243.GA15127@linux.vnet.ibm.com>
2011-12-14 15:47 ` [GIT PULL rcu/next] RCU commits for 3.3 Ingo Molnar
2011-12-14 16:30   ` Frederic Weisbecker
2011-12-14 17:47     ` Frederic Weisbecker
2011-12-14 20:48       ` Paul E. McKenney
2011-12-15  1:35       ` Suresh Siddha
2011-12-15  1:41         ` Paul E. McKenney
2011-12-15  7:06       ` Ingo Molnar [this message]

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=20111215070604.GC14237@elte.hu \
    --to=mingo@elte.hu \
    --cc=a.p.zijlstra@chello.nl \
    --cc=fweisbec@gmail.com \
    --cc=josh@joshtriplett.org \
    --cc=keescook@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=paulmck@linux.vnet.ibm.com \
    --cc=suresh.b.siddha@intel.com \
    --cc=tglx@linutronix.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.