From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ingo Molnar <mingo@elte•hu>
Cc: Tejun Heo <tj@kernel•org>,
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 17:45:24 +1100 [thread overview]
Message-ID: <20101005174524.b62d14a1.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20101005063227.GB12267@elte.hu>
[-- Attachment #1: Type: text/plain, Size: 2567 bytes --]
Hi Ingo,
On Tue, 5 Oct 2010 08:32:27 +0200 Ingo Molnar <mingo@elte•hu> wrote:
>
> 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 ...
At the time that this tree was added to linux-next (in July), I responded
to Tejun like this:
------------------------------------------------------------------------
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tejun Heo <tj@kernel•org>
Cc: "linux-next@vger•kernel.org" <linux-next@vger•kernel.org>, Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>, "H. Peter Anvin" <hpa@zytor•com>, Peter Zijlstra <peterz@infradead•org>, LKML <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: please pull in from lost-spurious-irq branch
Date: Thu, 29 Jul 2010 01:35:09 +1000
Hi Tejun,
On Wed, 28 Jul 2010 15:50:55 +0200 Tejun Heo <tj@kernel•org> wrote:
>
> If possible, can you please pull the following branch into linux-next?
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git lost-spurious-irq
>
> It's scheduled to go through tip/genirq, so once it shows up in tip,
> the above branch can be dropped from linux-next. As the merge window
> is closing in, I'm hoping to get it tested enough in linux-next. The
> branch is based on rc3 but merges without conflict into the current
> mainline.
OK, added from today. I'll keep an eye out for it in the tip tree.
------------------------------------------------------------------------
Not sure what I can do beyond making sure that all relevant people are
informed about what trees are being merged. There is a certain amount of
good faith involved in all our development processes.
In any case, it will be dropped tomorrow.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next prev parent reply other threads:[~2010-10-05 6:45 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 [this message]
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=20101005174524.b62d14a1.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--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
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