linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mike Travis <travis@sgi.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Rusty Russell <rusty@rustcorp.com.au>,
	linux-next@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>,
	Ingo Molnar <mingo@elte.hu>
Subject: Re: linux-next: manual merge of the rr_cpumask tree
Date: Tue, 16 Dec 2008 08:03:11 -0800	[thread overview]
Message-ID: <4947D13F.6020105@sgi.com> (raw)
In-Reply-To: <20081216170940.3c74d4d0.sfr@canb.auug.org.au>

Stephen Rothwell wrote:
> Hi Mike,
> 
> On Mon, 15 Dec 2008 22:02:25 -0800 Mike Travis <travis@sgi.com> wrote:
>> Yes, I did finally figure that out.  Thanks for rebasing the part that Ingo needed
>> so maybe the rest can be pushed.  There was a problem when the 'for-ingo' tree was
>> merged as there were mixed up API calls in io_apic.c, but I fixed them in the first
>> x86 only patch.  I wasn't sure of what else to do.
> 
> You could have fixed them up as part of the actual merge commit.  If each
> tree was correct on it own, then the merge is the place for such
> resolutions.
> 

Thanks, I will try that next time.

Ingo - if you need a small patch to make the post-merge tree buildable, let me know. 
I can extract that from the 1st patch (that modifies the smp api).

Thanks,
Mike

  reply	other threads:[~2008-12-16 16:03 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-12-15  6:09 linux-next: manual merge of the rr_cpumask tree 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 [this message]
2008-12-16 20:55             ` Ingo Molnar
  -- strict thread matches above, loose matches on Subject: below --
2008-12-15  6:09 Stephen Rothwell
2009-01-02  2:35 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
2009-01-02 12:52   ` Ingo Molnar
2009-01-02  2:43 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=4947D13F.6020105@sgi.com \
    --to=travis@sgi.com \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=rusty@rustcorp.com.au \
    --cc=sfr@canb.auug.org.au \
    --cc=yinghai@kernel.org \
    /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).