lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 26 May 2010 11:53:46 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Michal Marek <mmarek@...e.cz>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
matt mooney <mfm@...eddisk.com>,
Randy Dunlap <randy.dunlap@...cle.com>,
Kirill Smelkov <kirr@....spb.ru>
Subject: linux-next: manual merge of the kbuild tree with the kernel-doc
tree
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@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists