From: Linus Torvalds <torvalds@linux-foundation.org>
To: Rusty Russell <rusty@rustcorp.com.au>
Cc: Mike Travis <travis@sgi.com>, Ingo Molnar <mingo@elte.hu>,
linux-kernel@vger.kernel.org
Subject: Re: [PULL] cpumask tree
Date: Fri, 2 Jan 2009 12:06:33 -0800 (PST) [thread overview]
Message-ID: <alpine.LFD.2.00.0901021149020.5086@localhost.localdomain> (raw)
In-Reply-To: <200901011149.18401.rusty@rustcorp.com.au>
On Thu, 1 Jan 2009, Rusty Russell wrote:
>
> OK, this is the bulk of the conversion to the new cpumask operators.
> The x86-specific parts (the most aggressive large-NR_CPUS arch) are going
> via Ingo's tree.
This gets lots of conflicts for me. Some of them look simple enough, but
not all. io_apic.c gets lots of nasty conflicts, and it _looks_ like I
should just pick the version of the file that I already have (because the
only thing that comes in from that is yet another merge commit), but
kernel/sched.c also gets conflicts in areas with FIXME's etc.
Rusty, Ingo, can you work this out? I pushed out my current tree.
Linus
next prev parent reply other threads:[~2009-01-02 20:06 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-01 1:19 Rusty Russell
2009-01-02 20:06 ` Linus Torvalds [this message]
2009-01-02 20:38 ` Ingo Molnar
2009-01-02 23:31 ` Linus Torvalds
2009-01-03 19:38 ` [git pull] cpus4096 tree, part 3 Ingo Molnar
2009-01-03 20:28 ` Linus Torvalds
2009-01-03 20:36 ` Ingo Molnar
2009-01-03 20:56 ` Linus Torvalds
2009-01-03 21:58 ` Ingo Molnar
2009-01-04 3:35 ` Rusty Russell
2009-01-04 4:28 ` Mike Travis
2009-01-03 21:38 ` Ingo Molnar
2009-01-03 22:00 ` Linus Torvalds
2009-01-03 22:37 ` Ingo Molnar
2009-01-05 1:14 ` Nick Piggin
2009-01-05 1:16 ` Nick Piggin
2009-01-26 19:00 ` Andrew Morton
2009-01-26 19:09 ` Linus Torvalds
2009-01-26 19:30 ` Andrew Morton
2009-01-26 20:09 ` Ingo Molnar
2009-01-26 20:44 ` Andrew Morton
[not found] ` <604427e00901261312w23a1f0f5y61fc5c6cc70297fb@mail.gmail.com>
2009-01-26 23:21 ` Ingo Molnar
2009-01-26 23:44 ` Andrew Morton
2009-01-07 17:30 ` Ingo Molnar
2009-01-03 20:58 ` Mike Travis
2009-01-03 7:20 ` [PULL] cpumask tree Rusty Russell
2009-01-03 10:52 ` Ingo Molnar
2009-01-03 11:59 ` [PATCH] ia64: cpumask fix for is_affinity_mask_valid() Ingo Molnar
2009-01-03 12:19 ` [PATCH] cpumask: convert RCU implementations, fix Ingo Molnar
2009-01-04 3:43 ` [PATCH] ia64: cpumask fix for is_affinity_mask_valid() Rusty Russell
2009-01-04 4:20 ` Mike Travis
2009-01-04 12:38 ` Ingo Molnar
2009-01-03 14:58 ` [PULL] cpumask tree Mike Travis
2009-01-03 15:06 ` Ingo Molnar
2009-01-03 15:31 ` Mike Travis
2009-01-03 15:47 ` Ingo Molnar
2009-01-03 15:52 ` Mike Travis
2009-01-03 16:00 ` Ingo Molnar
2009-01-03 16:09 ` Mike Travis
2009-01-03 16:42 ` Ingo Molnar
2009-01-03 16:48 ` Mike Travis
2009-01-03 17:45 ` Ingo Molnar
2009-01-03 18:13 ` Ingo Molnar
2009-01-03 18:14 ` Mike Travis
2009-01-03 0:23 ` Rusty Russell
2009-01-08 19:10 ` David Daney
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=alpine.LFD.2.00.0901021149020.5086@localhost.localdomain \
--to=torvalds@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rusty@rustcorp.com.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®