From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Michal Marek <mmarek@suse•cz>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
matt mooney <mfm@muteddisk•com>,
Randy Dunlap <randy.dunlap@oracle•com>,
Kirill Smelkov <kirr@mns•spb.ru>
Subject: linux-next: manual merge of the kbuild tree with the kernel-doc tree
Date: Wed, 26 May 2010 11:53:46 +1000 [thread overview]
Message-ID: <20100526115346.da5a02aa.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 520 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2010-05-26 1:53 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-26 1:53 Stephen Rothwell [this message]
2010-05-26 15:47 ` linux-next: manual merge of the kbuild tree with the kernel-doc tree Randy Dunlap
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=20100526115346.da5a02aa.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=kirr@mns$(echo .)spb.ru \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mfm@muteddisk$(echo .)com \
--cc=mmarek@suse$(echo .)cz \
--cc=randy.dunlap@oracle$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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