public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Ingo Molnar <mingo@elte•hu>
To: Tejun Heo <tj@kernel•org>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
	linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	Thomas Gleixner <tglx@linutronix•de>,
	"H. Peter Anvin" <hpa@zytor•com>,
	Peter Zijlstra <peterz@infradead•org>
Subject: Re: linux-next: manual merge of the lost-spurious-irq tree with the tip tree
Date: Tue, 5 Oct 2010 08:32:27 +0200	[thread overview]
Message-ID: <20101005063227.GB12267@elte.hu> (raw)
In-Reply-To: <4CAABC0E.3030700@kernel.org>


* Tejun Heo <tj@kernel•org> wrote:

> > I think I fixed it all up (see below).  I can carry this fix (or a 
> > better one) as necessary.
> 
> Can you please drop lost-spurious-irq for now?  It needs to be 
> reimplemented.  I'll send a merge request again when it's ready.

Please send irq merge requests to Thomas instead and wait for those 
genirq bits to show up upstream. (You did so in the past and the review 
process was ongoing AFAICS)

Otherwise we would be dilluting linux-next testing with random side 
effects from a tree that wasnt yet (in that form) scheduled to go 
upstream by its respective maintainer at that time.

We were lucky that this showed up as merge complications - what if 
instead it merged 'fine' on the textual and build/boot level but 
mis-merged on the functional level in subtle ways? Thomas would be 
sending something to Linus that was never really tested in linux-next in 
that form, caused problems upstream, and Linus would be rightfully upset 
about the situation.

Stephen, you need to enforce such things ...

Thanks,

	Ingo

next prev parent reply	other threads:[~2010-10-05  6:32 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-05  3:13 linux-next: manual merge of the lost-spurious-irq tree with the tip tree Stephen Rothwell
2010-10-05  3:20 ` Stephen Rothwell
2010-10-05  5:47 ` Tejun Heo
2010-10-05  6:32   ` Ingo Molnar [this message]
2010-10-05  6:45     ` Stephen Rothwell
2010-10-05  7:01       ` Ingo Molnar
2010-10-05  8:38         ` Stephen Rothwell
2010-10-05  9:12           ` Ingo Molnar
2010-10-05  6:55     ` Tejun Heo
2010-10-05  6:59       ` Tejun Heo
  -- strict thread matches above, loose matches on Subject: below --
2010-10-05  3:12 Stephen Rothwell

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=20101005063227.GB12267@elte.hu \
    --to=mingo@elte$(echo .)hu \
    --cc=hpa@zytor$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=peterz@infradead$(echo .)org \
    --cc=sfr@canb$(echo .)auug.org.au \
    --cc=tglx@linutronix$(echo .)de \
    --cc=tj@kernel$(echo .)org \
    /path/to/YOUR_REPLY

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox