From: Ingo Molnar <mingo@elte•hu>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, Thomas Gleixner <tglx@linutronix•de>,
"H. Peter Anvin" <hpa@zytor•com>
Subject: Re: linux-next: manual merge of the sparseirq tree
Date: Thu, 16 Oct 2008 10:13:47 +0200 [thread overview]
Message-ID: <20081016081346.GA17082@elte.hu> (raw)
In-Reply-To: <20081016190840.2e42a5a8.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi Ingo,
>
> Today's linux-next merge of the sparseirq tree got a lot of conflicts
> with various other trees. For today, I will drop it and maybe have
> another look tomorrow when things are (hopefully) less busy. [...]
okay, agreed - i've just reset auto-sparseirq-next to Linus and will
update it with a merged up tree. (which we have in the works)
> [...] If you could fix up any internal-to-tip and Linus conflicts,
> that would be great.
no other topic should be conflicting that i know of.
Ingo
next prev parent reply other threads:[~2008-10-16 8:13 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-16 8:08 linux-next: manual merge of the sparseirq tree Stephen Rothwell
2008-10-16 8:13 ` Ingo Molnar [this message]
2008-10-16 8:30 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-09-15 15:19 Stephen Rothwell
2008-09-15 18:35 ` Roland McGrath
2008-09-17 10:20 ` Ingo Molnar
2008-09-15 14:58 Stephen Rothwell
2008-08-25 9:32 Stephen Rothwell
2008-08-25 19:37 ` Jeremy Fitzhardinge
2008-08-25 23:48 ` 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=20081016081346.GA17082@elte.hu \
--to=mingo@elte$(echo .)hu \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/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