From: Randy Dunlap <randy.dunlap@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Michal Marek <mmarek@suse.cz>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
matt mooney <mfm@muteddisk.com>, Kirill Smelkov <kirr@mns.spb.ru>
Subject: Re: linux-next: manual merge of the kbuild tree with the kernel-doc tree
Date: Wed, 26 May 2010 08:47:50 -0700 [thread overview]
Message-ID: <4BFD42A6.6060206@oracle.com> (raw)
In-Reply-To: <20100526115346.da5a02aa.sfr@canb.auug.org.au>
On 05/25/10 18:53, Stephen Rothwell wrote:
> Hi Michal,
>
> Today's linux-next merge of the kbuild tree got a conflict in
> Documentation/kbuild/makefiles.txt between commit
> 74bb7003010ff0998e280a6ade09381168ff20ec
> ("docs-kbuild-make-examples-content2") from the kernel-doc tree and
> commit e8d400a933fa44e2fba3849b084e1ae5814d7fca ("kbuild: fix a couple of
> typos in Documentation") from the kbuild tree.
>
> The former also fixed the typo, so I used that.
If Michal has merged it, I'll drop it.
Michal, can I view your tree by using gitweb? (i.e., http)
or is it only accessible by pulling/cloning?
thanks,
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
next prev parent reply other threads:[~2010-05-26 15:49 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-26 1:53 linux-next: manual merge of the kbuild tree with the kernel-doc tree Stephen Rothwell
2010-05-26 15:47 ` Randy Dunlap [this message]
2010-05-26 16:50 ` Stephen Rothwell
2010-05-26 16:56 ` Randy Dunlap
2010-05-26 23:09 ` Stephen Rothwell
2010-05-27 0:00 ` Randy Dunlap
2010-05-27 1:03 ` Stephen Rothwell
2010-05-27 14:16 ` Michal Marek
2010-05-27 15:34 ` 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=4BFD42A6.6060206@oracle.com \
--to=randy.dunlap@oracle.com \
--cc=kirr@mns.spb.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mfm@muteddisk.com \
--cc=mmarek@suse.cz \
--cc=sfr@canb.auug.org.au \
/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