From: Randy Dunlap <randy.dunlap@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org,
Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Pekka Enberg <penberg@cs.helsinki.fi>
Subject: Re: linux-next: manual merge of the kernel-doc tree with the tracing and timers trees
Date: Thu, 05 Mar 2009 19:12:48 -0800 [thread overview]
Message-ID: <49B094B0.20606@oracle.com> (raw)
In-Reply-To: <20090306132104.16a0af9d.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi Randy,
>
> Today's linux-next merge of the kernel-doc tree got a conflict in
> Documentation/kernel-parameters.txt between commits
> b9ce08c01020eb28bfbfa6faf1c740281c5f418e ("kmemtrace: Core
> implementation") fron the tracing tree and
> b98103a5597b87211a1c74077b06faeac554bedc ("x86: hpet: print HPET
> registers during setup (if hpet=verbose is used)") from the timers tree
> and commit 8e141e0b33e2fd17540881a1ead5103dd229bf81
> ("docum-kernprms-alpha3") from the kernel-doc tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Sounds good. Thanks.
--
~Randy
prev parent reply other threads:[~2009-03-06 3:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-06 2:21 linux-next: manual merge of the kernel-doc tree with the tracing and timers trees Stephen Rothwell
2009-03-06 3:12 ` Randy Dunlap [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=49B094B0.20606@oracle.com \
--to=randy.dunlap@oracle.com \
--cc=eduard.munteanu@linux360.ro \
--cc=hpa@zytor.com \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=penberg@cs.helsinki.fi \
--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).