lkml.org 
[lkml]   [2012]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: build failure after merge of the hid tree
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


\
 
 \ /
  Last update: 2012-06-29 15:41    [W:0.030 / U:1.836 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site