From: Ingo Molnar <mingo@elte.hu>
To: Arjan van de Ven <arjan@infradead.org>
Cc: linux-kernel@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>
Subject: Re: [PATCH] fastboot: fix mismerged conflict in init/main.c
Date: Sat, 20 Sep 2008 06:52:58 +0200 [thread overview]
Message-ID: <20080920045258.GA16047@elte.hu> (raw)
In-Reply-To: <20080919215014.37e2196d@infradead.org>
* Arjan van de Ven <arjan@infradead.org> wrote:
> > From: Arjan van de Ven <arjan@linux.intel.com>
> > Subject: [PATCH] fastboot: fix mismerged conflict in init/main.c
>
> ok turns out it was a real conflict, not a mismerge. I've just fixed it
> and pushed out my git tree.
>
> The following changes since commit
> 77e9695b9d5c9ce761dedc193045d9cb64b8e245: Arjan van de Ven (1):
> Add a script to visualize the kernel boot process / time
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-fastboot.git
> master
>
> Arjan van de Ven (2):
> fastboot: fix issues and improve output of bootgraph.pl
> use the fancy new printk flags to print the function pointer
>
> Arnaud Patard (1):
> fastboot: Fix bootgraph.pl initcall name regexp
>
> init/main.c | 8 +++-----
> scripts/bootgraph.pl | 33 +++++++++++++++++++++------------
> 2 files changed, 24 insertions(+), 17 deletions(-)
pulled into tip/fastboot, thanks Arjan!
Ingo
prev parent reply other threads:[~2008-09-20 4:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-20 2:42 [PATCH] fastboot: fix mismerged conflict in init/main.c Arjan van de Ven
2008-09-20 4:50 ` Arjan van de Ven
2008-09-20 4:52 ` Ingo Molnar [this message]
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=20080920045258.GA16047@elte.hu \
--to=mingo@elte.hu \
--cc=arjan@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--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