Messages in this thread | | | Date | Wed, 26 May 2010 08:47:50 -0700 | From | Randy Dunlap <> | Subject | Re: linux-next: manual merge of the kbuild tree with the kernel-doc tree |
| |
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 ***
| |