* linux-next: manual merge of the kbuild tree with the kernel-doc tree
@ 2010-05-26 1:53 Stephen Rothwell
2010-05-26 15:47 ` Randy Dunlap
0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2010-05-26 1:53 UTC (permalink / raw)
To: Michal Marek
Cc: linux-next, linux-kernel, matt mooney, Randy Dunlap, Kirill Smelkov
[-- 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 --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the kbuild tree with the kernel-doc tree
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
2010-05-26 16:50 ` Stephen Rothwell
0 siblings, 1 reply; 9+ messages in thread
From: Randy Dunlap @ 2010-05-26 15:47 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Michal Marek, linux-next, linux-kernel, matt mooney, Kirill Smelkov
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 ***
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the kbuild tree with the kernel-doc tree
2010-05-26 15:47 ` Randy Dunlap
@ 2010-05-26 16:50 ` Stephen Rothwell
2010-05-26 16:56 ` Randy Dunlap
0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2010-05-26 16:50 UTC (permalink / raw)
To: Randy Dunlap
Cc: Michal Marek, linux-next, linux-kernel, matt mooney, Kirill Smelkov
[-- Attachment #1: Type: text/plain, Size: 990 bytes --]
Hi Randy,
On Wed, 26 May 2010 08:47:50 -0700 Randy Dunlap <randy.dunlap@oracle.com> wrote:
>
> On 05/25/10 18:53, Stephen Rothwell wrote:
> >
> > 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?
The kernel-doc tree is a quilt series :-(
You can, of course, see the above commit in the linux-next tree via
gitweb on kernel.org.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the kbuild tree with the kernel-doc tree
2010-05-26 16:50 ` Stephen Rothwell
@ 2010-05-26 16:56 ` Randy Dunlap
2010-05-26 23:09 ` Stephen Rothwell
0 siblings, 1 reply; 9+ messages in thread
From: Randy Dunlap @ 2010-05-26 16:56 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Michal Marek, linux-next, linux-kernel, matt mooney, Kirill Smelkov
On Thu, 27 May 2010 02:50:20 +1000 Stephen Rothwell wrote:
> Hi Randy,
>
> On Wed, 26 May 2010 08:47:50 -0700 Randy Dunlap <randy.dunlap@oracle.com> wrote:
> >
> > On 05/25/10 18:53, Stephen Rothwell wrote:
> > >
> > > 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?
>
> The kernel-doc tree is a quilt series :-(
Yes. and it's viewable without pulling/cloning. ;)
> You can, of course, see the above commit in the linux-next tree via
> gitweb on kernel.org.
Thanks. Michal, I droppped these 3 patches. Please keep them in the
kbuild tree.
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the kbuild tree with the kernel-doc tree
2010-05-26 16:56 ` Randy Dunlap
@ 2010-05-26 23:09 ` Stephen Rothwell
2010-05-27 0:00 ` Randy Dunlap
0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2010-05-26 23:09 UTC (permalink / raw)
To: Randy Dunlap
Cc: Michal Marek, linux-next, linux-kernel, matt mooney, Kirill Smelkov
[-- Attachment #1: Type: text/plain, Size: 741 bytes --]
Hi Randy,
On Wed, 26 May 2010 09:56:06 -0700 Randy Dunlap <randy.dunlap@oracle.com> wrote:
>
> > The kernel-doc tree is a quilt series :-(
>
> Yes. and it's viewable without pulling/cloning. ;)
Ah, I shouldn't reply to emails so late at night :-(
> > You can, of course, see the above commit in the linux-next tree via
> > gitweb on kernel.org.
>
> Thanks. Michal, I droppped these 3 patches. Please keep them in the
> kbuild tree.
If anything, the kernel-doc patches should be kept as they are much more
extensive. And the conflict was trivial. The kbuild patch was just
fixing a typo (tey -> they).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the kbuild tree with the kernel-doc tree
2010-05-26 23:09 ` Stephen Rothwell
@ 2010-05-27 0:00 ` Randy Dunlap
2010-05-27 1:03 ` Stephen Rothwell
0 siblings, 1 reply; 9+ messages in thread
From: Randy Dunlap @ 2010-05-27 0:00 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Michal Marek, linux-next, linux-kernel, matt mooney, Kirill Smelkov
On 05/26/10 16:09, Stephen Rothwell wrote:
> Hi Randy,
>
> On Wed, 26 May 2010 09:56:06 -0700 Randy Dunlap <randy.dunlap@oracle.com> wrote:
>>
>>> The kernel-doc tree is a quilt series :-(
>>
>> Yes. and it's viewable without pulling/cloning. ;)
>
> Ah, I shouldn't reply to emails so late at night :-(
>
>>> You can, of course, see the above commit in the linux-next tree via
>>> gitweb on kernel.org.
>>
>> Thanks. Michal, I droppped these 3 patches. Please keep them in the
>> kbuild tree.
>
> If anything, the kernel-doc patches should be kept as they are much more
> extensive. And the conflict was trivial. The kbuild patch was just
> fixing a typo (tey -> they).
uh oh. OK, thanks, I'll restore them.
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the kbuild tree with the kernel-doc tree
2010-05-27 0:00 ` Randy Dunlap
@ 2010-05-27 1:03 ` Stephen Rothwell
2010-05-27 14:16 ` Michal Marek
0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2010-05-27 1:03 UTC (permalink / raw)
To: Randy Dunlap
Cc: Michal Marek, linux-next, linux-kernel, matt mooney, Kirill Smelkov
[-- Attachment #1: Type: text/plain, Size: 279 bytes --]
Hi Randy,
On Wed, 26 May 2010 17:00:11 -0700 Randy Dunlap <randy.dunlap@oracle.com> wrote:
>
> uh oh. OK, thanks, I'll restore them.
Thanks. I picked them up.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the kbuild tree with the kernel-doc tree
2010-05-27 1:03 ` Stephen Rothwell
@ 2010-05-27 14:16 ` Michal Marek
2010-05-27 15:34 ` Stephen Rothwell
0 siblings, 1 reply; 9+ messages in thread
From: Michal Marek @ 2010-05-27 14:16 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Randy Dunlap, linux-next, linux-kernel, matt mooney, Kirill Smelkov
On 27.5.2010 03:03, Stephen Rothwell wrote:
> Hi Randy,
>
> On Wed, 26 May 2010 17:00:11 -0700 Randy Dunlap <randy.dunlap@oracle.com> wrote:
>> uh oh. OK, thanks, I'll restore them.
>
> Thanks. I picked them up.
I reverted part of the kbuild patch so that the two trees merge cleanly
again.
Michal
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the kbuild tree with the kernel-doc tree
2010-05-27 14:16 ` Michal Marek
@ 2010-05-27 15:34 ` Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2010-05-27 15:34 UTC (permalink / raw)
To: Michal Marek
Cc: Randy Dunlap, linux-next, linux-kernel, matt mooney, Kirill Smelkov
[-- Attachment #1: Type: text/plain, Size: 536 bytes --]
Hi Michal,
On Thu, 27 May 2010 16:16:12 +0200 Michal Marek <mmarek@suse.cz> wrote:
>
> On 27.5.2010 03:03, Stephen Rothwell wrote:
> > Hi Randy,
> >
> > On Wed, 26 May 2010 17:00:11 -0700 Randy Dunlap <randy.dunlap@oracle.com> wrote:
> >> uh oh. OK, thanks, I'll restore them.
> >
> > Thanks. I picked them up.
>
> I reverted part of the kbuild patch so that the two trees merge cleanly
> again.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2010-05-27 15:34 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
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
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).