public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: paulmck@linux.vnet.ibm.com, Thomas Gleixner <tglx@linutronix.de>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Lai Jiangshan <laijs@cn.fujitsu.com>,
	"David S. Miller" <davem@davemloft.net>,
	"John W. Linville" <linville@tuxdriver.com>,
	Johannes Berg <johannes.berg@intel.com>
Subject: Re: linux-next: manual merge of the tip tree with the wireless tree
Date: Tue, 17 May 2011 10:09:39 +0200	[thread overview]
Message-ID: <20110517080939.GD22093@elte.hu> (raw)
In-Reply-To: <20110517172103.a196fbe1.sfr@canb.auug.org.au>


* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Paul,
> 
> On Tue, 17 May 2011 00:05:58 -0700 "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> wrote:
> >
> > One of these is mine in -tip (0744371aeb).  Please let me know what
> > I should be doing about it.
> 
> In this case, I would say absolutely nothing (assuming I did the
> resolution correctly) :-)  If I can figure it out, Linus can as well and
> will do so when these trees hit his in a week or so.

Yeah. The two trees are doing different things, and both commits are within 
their own scopes - so this conflict is a natural (and as it seems, mostly 
contextual) conflict, not a workflow messup.

If such conflicts become too numerous then it would make sense to first push 
rcu_kfree() interface upstream and propagate all the fixlets via the individual 
maintainer trees.

I don't think that's necessary: so far the fallout appears to be limited, but 
Stephen will (or should :-) tell us if a conflicts become too painful for him.

Thanks,

	Ingo

      reply	other threads:[~2011-05-17  8:10 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-17  3:14 linux-next: manual merge of the tip tree with the wireless tree Stephen Rothwell
2011-05-17  7:05 ` Paul E. McKenney
2011-05-17  7:21   ` Stephen Rothwell
2011-05-17  8:09     ` 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=20110517080939.GD22093@elte.hu \
    --to=mingo@elte.hu \
    --cc=davem@davemloft.net \
    --cc=hpa@zytor.com \
    --cc=johannes.berg@intel.com \
    --cc=laijs@cn.fujitsu.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=paulmck@linux.vnet.ibm.com \
    --cc=peterz@infradead.org \
    --cc=sfr@canb.auug.org.au \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox