From: Ingo Molnar <mingo@elte.hu>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Travis <travis@sgi.com>,
Rusty Russell <rusty@rustcorp.com.au>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Al Viro <viro@ZenIV.linux.org.uk>
Subject: Re: [rfc git pull] cpus4096 fixes, take 2
Date: Mon, 28 Jul 2008 23:35:32 +0200 [thread overview]
Message-ID: <20080728213532.GA24744@elte.hu> (raw)
In-Reply-To: <20080728205700.GA3613@elte.hu>
* Ingo Molnar <mingo@elte.hu> wrote:
> Linus,
>
> Please pull the latest cpus4096 git tree from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git cpus4096
This has a trivial conflict with the latest tree you just pushed out.
I've pushed the resolution out into the cpus4096-v2 branch, which you
can pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git cpus4096-v2
all testsystems are still OK.
Ingo
next prev parent reply other threads:[~2008-07-28 21:35 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-27 19:06 [git pull] cpus4096 fixes Ingo Molnar
2008-07-27 20:15 ` Linus Torvalds
2008-07-27 21:03 ` Ingo Molnar
2008-07-28 18:42 ` Mike Travis
2008-07-27 21:05 ` Al Viro
2008-07-27 22:17 ` Linus Torvalds
2008-07-28 0:42 ` Rusty Russell
2008-07-28 3:06 ` Andrew Morton
2008-07-28 6:34 ` Rusty Russell
2008-07-28 6:58 ` Nick Piggin
2008-07-28 7:56 ` Ingo Molnar
2008-07-28 18:12 ` Mike Travis
2008-07-28 8:33 ` Ingo Molnar
2008-07-28 18:07 ` Mike Travis
2008-07-28 17:50 ` Mike Travis
2008-07-28 18:32 ` Linus Torvalds
2008-07-28 18:37 ` Linus Torvalds
2008-07-28 18:51 ` Ingo Molnar
2008-07-28 19:22 ` Mike Travis
2008-07-28 19:31 ` Mike Travis
2008-07-28 19:04 ` Mike Travis
2008-07-28 20:57 ` [rfc git pull] cpus4096 fixes, take 2 Ingo Molnar
2008-07-28 21:35 ` Ingo Molnar [this message]
2008-07-28 21:41 ` [build error] drivers/char/pcmcia/ipwireless/hardware.c:571: error: invalid use of undefined type 'struct ipw_network' Ingo Molnar
2008-07-28 22:06 ` Ingo Molnar
2008-07-28 22:20 ` Andrew Morton
2008-07-28 22:29 ` Ingo Molnar
2008-07-30 14:59 ` David Sterba
2008-07-30 15:11 ` James Bottomley
2008-07-30 15:14 ` Jiri Kosina
2008-07-28 21:36 ` [rfc git pull] cpus4096 fixes, take 2 Mike Travis
2008-07-29 1:45 ` Rusty Russell
2008-07-29 12:11 ` Ingo Molnar
2008-07-30 0:15 ` Rusty Russell
2008-07-28 18:46 ` [git pull] cpus4096 fixes Mike Travis
2008-07-28 19:13 ` Ingo Molnar
2008-07-29 1:33 ` Rusty Russell
2008-07-28 0:53 ` Rusty Russell
2008-07-28 8:16 ` Ingo Molnar
2008-07-28 13:21 ` Rusty Russell
2008-07-28 18:23 ` Mike Travis
2008-07-31 10:30 ` Ingo Molnar
2008-07-28 8:43 ` 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=20080728213532.GA24744@elte.hu \
--to=mingo@elte.hu \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rusty@rustcorp.com.au \
--cc=torvalds@linux-foundation.org \
--cc=travis@sgi.com \
--cc=viro@ZenIV.linux.org.uk \
/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.