From: Tejun Heo <tj@kernel.org>
To: Ingo Molnar <mingo@elte.hu>
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, 05 Oct 2010 08:55:22 +0200 [thread overview]
Message-ID: <4CAACBDA.6090308@kernel.org> (raw)
In-Reply-To: <20101005063227.GB12267@elte.hu>
Hello, Ingo.
On 10/05/2010 08:32 AM, Ingo Molnar wrote:
>
> * 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 ...
I think Stephen had done enough. At the time, I wasn't sure which
tree it was going to go through and it took some time before Thomas
responded, so I was intending to push it through separately. I should
have retracted the tree right after it was determined to be
reimplemented but forgot. That's my mistake not Stephen's. Sorry
about that.
Thanks.
--
tejun
next prev parent reply other threads:[~2010-10-05 6:53 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
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 [this message]
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=4CAACBDA.6090308@kernel.org \
--to=tj@kernel.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--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;
as well as URLs for NNTP newsgroup(s).