From: Ingo Molnar <mingo@elte.hu>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Rusty Russell <rusty@rustcorp.com.au>,
linux-next@vger.kernel.org, Mike Travis <travis@sgi.com>
Subject: Re: linux-next: manual merge of the rr_cpumask tree
Date: Fri, 2 Jan 2009 10:59:06 +0100 [thread overview]
Message-ID: <20090102095906.GI1975@elte.hu> (raw)
In-Reply-To: <20090102133557.0750cdbe.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Rusty,
>
> Today's linux-next merge of the rr_cpumask tree got a conflict in
> arch/x86/kernel/io_apic.c between commit
> 22f65d31b25a320a5246592160bcb102d2791c45 ("x86: Update io_apic.c to use
> new cpumask API") from the cpus4096 tree and commit
> 2ca1a615835d9f4990f42102ab1f2ef434e7e89c ("Merge branch 'master' of
> git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6") (or
> something - I suspect git has failed me a little here) from the
> rr_cpumask tree.
>
> It is a bit of a train wreck :-)
>
> I have dropped the rr_cpumask tree for today and also the rr tree that
> depends on it.
hm, i'll work with Rusty on fixing that - you should really not be seeing
conflicts on that level.
Ingo
next prev parent reply other threads:[~2009-01-02 9:59 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-02 2:35 linux-next: manual merge of the rr_cpumask tree Stephen Rothwell
2009-01-02 5:47 ` Rusty Russell
2009-01-02 6:21 ` Stephen Rothwell
2009-01-02 17:21 ` Mike Travis
2009-01-02 9:59 ` Ingo Molnar [this message]
2009-01-02 12:52 ` Ingo Molnar
-- strict thread matches above, loose matches on Subject: below --
2009-01-02 2:43 Stephen Rothwell
2008-12-15 6:09 Stephen Rothwell
2008-12-15 6:09 Stephen Rothwell
2008-12-15 6:41 ` Rusty Russell
2008-12-15 16:27 ` Mike Travis
2008-12-15 18:40 ` Mike Travis
2008-12-16 5:40 ` Rusty Russell
2008-12-16 6:02 ` Mike Travis
2008-12-16 6:09 ` Stephen Rothwell
2008-12-16 16:03 ` Mike Travis
2008-12-16 20:55 ` Ingo Molnar
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=20090102095906.GI1975@elte.hu \
--to=mingo@elte.hu \
--cc=linux-next@vger.kernel.org \
--cc=rusty@rustcorp.com.au \
--cc=sfr@canb.auug.org.au \
--cc=travis@sgi.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.