linux-next: manual merge of the kbuild tree with the kernel-doc tree

linux-next: manual merge of the kbuild tree with the kernel-doc tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: manual merge of the kbuild tree with the kernel-doc tree

[Randy Dunlap]

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 ***

Re: linux-next: manual merge of the kbuild tree with the kernel-doc tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: manual merge of the kbuild tree with the kernel-doc tree

[Randy Dunlap]

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 ***

Re: linux-next: manual merge of the kbuild tree with the kernel-doc tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: manual merge of the kbuild tree with the kernel-doc tree

[Randy Dunlap]

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 ***

Re: linux-next: manual merge of the kbuild tree with the kernel-doc tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: manual merge of the kbuild tree with the kernel-doc tree

[Michal Marek]

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

Re: linux-next: manual merge of the kbuild tree with the kernel-doc tree

[Stephen Rothwell]

[-- 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 --]