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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
