From: Ingo Molnar <mingo@elte.hu>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the x86 tree
Date: Fri, 4 Jul 2008 11:41:46 +0200 [thread overview]
Message-ID: <20080704094146.GA22658@elte.hu> (raw)
In-Reply-To: <20080704134111.4ad2d444.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the x86 tree got a conflict in
> arch/x86/Kconfig between commit
> efac41894df57d32b483ac622d03541b5b2692c0 ("x86: fix NODES_SHIFT
> Kconfig range") from Linus' tree and commit
> dfdf1d75efee39e9396f8384c6f3bf555349ed60 ("x86: modify Kconfig to
> allow up to 4096 cpus") from the x86 tree.
>
> I took the version from the x86 tree.
that's the correct resolution i took too - thanks Stephen.
Ingo
next prev parent reply other threads:[~2008-07-04 9:42 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-04 3:41 linux-next: manual merge of the x86 tree Stephen Rothwell
2008-07-04 9:41 ` Ingo Molnar [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-10-14 2:23 Stephen Rothwell
2008-09-11 23:37 Stephen Rothwell
2008-09-14 15:16 ` Ingo Molnar
2008-09-14 18:11 ` Stephen Rothwell
2008-09-11 23:34 Stephen Rothwell
2008-09-14 15:18 ` Ingo Molnar
2008-09-14 18:13 ` Stephen Rothwell
2008-09-03 0:57 Stephen Rothwell
2008-09-05 16:00 ` Ingo Molnar
2008-09-02 1:32 Stephen Rothwell
2008-09-05 18:22 ` Ingo Molnar
2008-08-15 3:58 Stephen Rothwell
2008-07-31 2:59 Stephen Rothwell
2008-07-23 2:51 Stephen Rothwell
2008-07-18 2:29 Stephen Rothwell
2008-07-17 1:43 Stephen Rothwell
2008-07-15 2:26 Stephen Rothwell
2008-07-14 1:30 Stephen Rothwell
2008-07-11 1:48 Stephen Rothwell
2008-07-11 1:47 Stephen Rothwell
2008-07-08 0:56 Stephen Rothwell
2008-07-08 3:22 ` Jeremy Fitzhardinge
2008-07-08 5:01 ` Stephen Rothwell
2008-07-08 5:28 ` Jeremy Fitzhardinge
2008-07-08 5:39 ` Ingo Molnar
2008-07-08 0:52 Stephen Rothwell
2008-07-04 3:50 Stephen Rothwell
2008-06-25 2:28 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=20080704094146.GA22658@elte.hu \
--to=mingo@elte.hu \
--cc=hpa@zytor.com \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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).