On Fri, 29 Jun 2012, Stephen Rothwell wrote:
> After merging the hid tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> drivers/hid/Kconfig:698: unexpected 'endif' within menu block
> drivers/hid/Kconfig:702: unexpected 'endmenu' within if block
> drivers/Kconfig:151: 'endmenu' in different file than 'menu'
> drivers/hid/Kconfig:79: location of the 'menu'
> arch/powerpc/kvm/Kconfig:153: syntax error
> drivers/Kconfig:1: missing end statement for this entry
>
> Caused by bad merge 8494746044bf ("Merge branch 'roccat' into
> for-next"). This added a second copy of
>
> menu "Special HID drivers"
>
> I have used the hid tree from next-20120628 for today.
Thanks for reporting this, Stephen; I have mismerged the branch. Just
pushed out fixed branch, so all should be okay now.
Thanks,
--
Jiri Kosina
SUSE Labs
--
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
