2022-08-01 21:50:02

by Mark Brown

[permalink] [raw]
Subject: linux-next: build failure after merge of the input tree

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;
| ^~~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

7af32d156ad7 ("Revert "HID: nintendo: Fix unused-const-variable compiler warning"")

interacting with

92cdfba40155 ("HID: nintendo: fix unused const warning")

I'll apply a fixup for now.


2022-08-04 12:43:11

by Mark Brown

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the input tree

On Mon, Aug 01, 2022 at 10:44:34PM +0100, [email protected] 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.

Attachments:
(No filename) (776.00 B)
 signature.asc (499.00 B)
 Download all attachments

2022-08-04 23:40:15

by Jiri Kosina

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the input tree

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