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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <nycvar.YFH.7.76.2208050133310.19850@cbobk.fhfr.pm>
Date:   Fri, 5 Aug 2022 01:36:23 +0200 (CEST)
From:   Jiri Kosina <jikos@...nel.org>
To:     Mark Brown <broonie@...nel.org>
cc:     Benjamin Tissoires <benjamin.tissoires@...hat.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
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