From: Jiri Kosina <jikos@kernel.org>
To: Mark Brown <broonie@kernel.org>
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the input tree
Date: Fri, 5 Aug 2022 01:36:23 +0200 (CEST) [thread overview]
Message-ID: <nycvar.YFH.7.76.2208050133310.19850@cbobk.fhfr.pm> (raw)
In-Reply-To: <Yuu8rmJ1VsGPakqF@sirena.org.uk>
On Thu, 4 Aug 2022, Mark Brown wrote:
> > Hi all,
> >
> > After merging the hid tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> >
> > /tmp/next/build/drivers/hid/hid-nintendo.c:406:29: error: redefinition of 'JC_RUMBLE_ZERO_AMP_PKT_CNT'
> > 406 | static const unsigned short JC_RUMBLE_ZERO_AMP_PKT_CNT = 5;
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > /tmp/next/build/drivers/hid/hid-nintendo.c:295:29: note: previous definition of 'JC_RUMBLE_ZERO_AMP_PKT_CNT' was here
> > 295 | static const unsigned short JC_RUMBLE_ZERO_AMP_PKT_CNT = 5;
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~~
>
> This error persists, I've gone back to 20220722 which seems to be the
> last version.
for-next branch accumulated so many reverts and -next-specific fixups (not
always correct) over the years (with the only goal of not rebasing it)
that it's now time to finally rebase it. Which I just did, and things
should be good now.
Sorry for the noise,
--
Jiri Kosina
SUSE Labs
next prev parent reply other threads:[~2022-08-04 23:36 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-01 21:44 linux-next: build failure after merge of the input tree broonie
2022-08-04 12:33 ` Mark Brown
2022-08-04 23:36 ` Jiri Kosina [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-10-24 23:00 Stephen Rothwell
2022-10-25 5:02 ` Dmitry Torokhov
2022-08-17 0:00 Stephen Rothwell
2022-08-17 0:07 ` Stephen Rothwell
2022-08-17 4:43 ` Uwe Kleine-König
2022-04-27 0:48 Stephen Rothwell
2022-04-27 6:53 ` Fabien Parent
2022-04-27 7:35 ` Lee Jones
2022-04-27 7:41 ` Fabien Parent
2022-05-02 2:17 ` Stephen Rothwell
2022-05-06 0:25 ` Dmitry Torokhov
2022-05-31 10:13 ` Fabien Parent
2020-03-25 7:16 Stephen Rothwell
2020-03-31 21:06 ` Stephen Rothwell
2015-10-16 2:19 Stephen Rothwell
2015-10-16 7:37 ` Hans de Goede
2015-10-17 16:39 ` Dmitry Torokhov
2015-07-24 1:49 Stephen Rothwell
2015-07-24 2:33 ` Dmitry Torokhov
2012-10-05 1:47 Stephen Rothwell
2012-10-05 6:12 ` Dmitry Torokhov
2012-01-24 3:25 Stephen Rothwell
2012-01-24 6:59 ` Dmitry Torokhov
2012-01-24 23:16 ` John Stultz
2010-08-19 1:35 Stephen Rothwell
2010-08-19 5:19 ` Dmitry Torokhov
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=nycvar.YFH.7.76.2208050133310.19850@cbobk.fhfr.pm \
--to=jikos@kernel.org \
--cc=benjamin.tissoires@redhat.com \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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).