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

Steven Rostedt
2011-05-20T03:54:56Z

On Fri, 2011-05-20 at 13:36 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in Makefile
> between commit 28bc20dccadc ("kbuild: implement several W= levels") from
> the kbuild tree and commit 85356f802225 ("kbuild/recordmcount: Add
> RECORDMCOUNT_WARN to warn about mcount callers") from the tip tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.

Acked-by: Steven Rostedt <rostedt@goodmis.org>

-- Steve