* linux-next: manual merge of the kbuild tree
@ 2008-07-23 3:52 Stephen Rothwell
2008-07-25 21:16 ` Sam Ravnborg
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2008-07-23 3:52 UTC (permalink / raw)
To: Sam Ravnborg
Cc: linux-next, Andrew Morton, Mathieu Desnoyers, Alexey Dobriyan
[-- Attachment #1: Type: text/plain, Size: 546 bytes --]
Hi Sam,
Today's linux-next merge of the kbuild tree got a conflict in Makefile
between commit d35cb360c29956510b2fe1a953bd4968536f7216 ("markers: fix
duplicate modpost entry") from Linus' tree and commit
c24009d75ac9fb5cb4510fbfe2cf1aaa98b20801 ("kbuild: make clean removes
*.o.* as well") from the kbuild tree.
The clean target had overlapping additions. I did the obvious fixup
(which was the same as Andrew did for -mm).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the kbuild tree
2008-07-23 3:52 linux-next: manual merge of the kbuild tree Stephen Rothwell
@ 2008-07-25 21:16 ` Sam Ravnborg
2008-07-26 12:00 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Sam Ravnborg @ 2008-07-25 21:16 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, Andrew Morton, Mathieu Desnoyers, Alexey Dobriyan
On Wed, Jul 23, 2008 at 01:52:05PM +1000, Stephen Rothwell wrote:
> Hi Sam,
>
> Today's linux-next merge of the kbuild tree got a conflict in Makefile
> between commit d35cb360c29956510b2fe1a953bd4968536f7216 ("markers: fix
> duplicate modpost entry") from Linus' tree and commit
> c24009d75ac9fb5cb4510fbfe2cf1aaa98b20801 ("kbuild: make clean removes
> *.o.* as well") from the kbuild tree.
>
> The clean target had overlapping additions. I did the obvious fixup
> (which was the same as Andrew did for -mm).
I fixed it up and pushed a new tre - which I also asked to be
pulled by Linus.
Sam
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the kbuild tree
2008-07-25 21:16 ` Sam Ravnborg
@ 2008-07-26 12:00 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2008-07-26 12:00 UTC (permalink / raw)
To: Sam Ravnborg
Cc: linux-next, Andrew Morton, Mathieu Desnoyers, Alexey Dobriyan
[-- Attachment #1: Type: text/plain, Size: 294 bytes --]
Hi Sam,
On Fri, 25 Jul 2008 23:16:57 +0200 Sam Ravnborg <sam@ravnborg•org> wrote:
>
> I fixed it up and pushed a new tre - which I also asked to be
> pulled by Linus.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-07-26 12:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-23 3:52 linux-next: manual merge of the kbuild tree Stephen Rothwell
2008-07-25 21:16 ` Sam Ravnborg
2008-07-26 12:00 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox