From: Jiri Kosina <jkosina@suse.cz>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jiri Kosina <jikos@jikos.cz>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: build failure after merge of the hid tree
Date: Fri, 29 Jun 2012 15:03:38 +0200 (CEST) [thread overview]
Message-ID: <alpine.LNX.2.00.1206291503010.11491@pobox.suse.cz> (raw)
In-Reply-To: <20120629124731.4577c98083269ca2d20c8d5f@canb.auug.org.au>
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
next prev parent reply other threads:[~2012-06-29 13:03 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-29 2:47 linux-next: build failure after merge of the hid tree Stephen Rothwell
2012-06-29 13:03 ` Jiri Kosina [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-05-07 1:06 Stephen Rothwell
2024-05-07 7:22 ` Kenny Levinsen
2024-04-11 0:51 Stephen Rothwell
2024-04-11 7:17 ` Benjamin Tissoires
2024-02-28 3:56 Stephen Rothwell
2022-07-25 0:40 Stephen Rothwell
2022-07-25 9:42 ` Jiri Kosina
2022-07-27 1:11 ` Stephen Rothwell
2021-12-03 7:01 Stephen Rothwell
2021-12-03 8:09 ` Greg Kroah-Hartman
2021-05-27 5:26 Stephen Rothwell
2021-05-27 8:14 ` Jiri Kosina
2021-05-27 8:25 ` Hans de Goede
2021-05-27 13:22 ` Naresh Kamboju
2021-05-27 13:42 ` Jiri Kosina
2019-10-04 0:28 Stephen Rothwell
2019-10-04 6:55 ` Hans de Goede
2016-12-11 23:59 Stephen Rothwell
2016-12-12 8:50 ` Jiri Kosina
2011-12-19 1:34 Stephen Rothwell
2011-12-19 8:21 ` Jiri Kosina
2011-11-29 1:00 Stephen Rothwell
2011-11-29 1:30 ` Jeremy Fitzhardinge
2011-06-08 3:03 Stephen Rothwell
2011-06-08 7:26 ` Stefan Kriwanek
2011-06-08 7:50 ` Jiri Kosina
2011-04-07 1:06 Stephen Rothwell
2011-04-07 13:00 ` Alan Ott
2011-04-08 23:54 ` Jiri Kosina
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LNX.2.00.1206291503010.11491@pobox.suse.cz \
--to=jkosina@suse.cz \
--cc=jikos@jikos.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).