Re: linux-next: build failure after merge of the input tree

[Jiri Kosina]

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