Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 5 Aug 2022 01:36:23 +0200 (CEST)
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
In-Reply-To: <Yuu8rmJ1VsGPakqF@sirena.org.uk>
Message-ID: <nycvar.YFH.7.76.2208050133310.19850@cbobk.fhfr.pm>
References: <20220801214434.2058469-1-broonie@kernel.org> <Yuu8rmJ1VsGPakqF@sirena.org.uk>
User-Agent: Alpine 2.21 (LSU 202 2017-01-01)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Precedence: bulk

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