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

Michal Marek
2012-05-07T19:25:54Z

Dne 7.5.2012 07:10, Stephen Rothwell napsal(a):
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in Makefile
> between commit 1f2bfbd00e46 ("kbuild: link of vmlinux moved to a script")
> from the kbuild tree and commit 1dbdc6f177c6 ("kbuild/extable: Hook up
> sortextable into the build system") from the tip tree.
>
> I used the Makefile bits from the kbuild tree and added the following
> patch as a merge fixup.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 7 May 2012 15:00:04 +1000
> Subject: [PATCH] kbuild: merge fix for sorting exceptions tables at build time

Looks correct, thanks.

Michal