[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <Y8ftWHG8Ek6Mjb3I@kroah.com>
Date: Wed, 18 Jan 2023 14:00:08 +0100
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: Umang Jain <umang.jain@...asonboard.com>
Cc: Stefan Wahren <stefan.wahren@...e.com>,
Arnd Bergmann <arnd@...nel.org>,
Florian Fainelli <f.fainelli@...il.com>,
Stephen Rothwell <sfr@...b.auug.org.au>,
Arnd Bergmann <arnd@...db.de>,
Broadcom internal kernel review list
<bcm-kernel-feedback-list@...adcom.com>,
Adrien Thierry <athierry@...hat.com>,
Nicolas Saenz Julienne <nsaenz@...nel.org>,
linux-staging@...ts.linux.dev,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] staging: vchiq_arm: fix enum vchiq_status return types
On Wed, Jan 18, 2023 at 05:33:15PM +0530, Umang Jain wrote:
> Hi,
>
> On 1/18/23 5:08 PM, Stefan Wahren wrote:
> > Hi Arnd,
> >
> > Am 17.01.23 um 17:39 schrieb Arnd Bergmann:
> > > From: Arnd Bergmann <arnd@...db.de>
> > >
> > > gcc-13 notices a type mismatch between function declaration
> > > and definition for a few functions that have been converted
> > > from returning vchiq specific status values to regular error
> > > codes:
> > >
> > > drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c:662:5:
> > > error: conflicting types for 'vchiq_initialise' due to enum/integer
> > > mismatch; have 'int(struct vchiq_instance **)'
> > > [-Werror=enum-int-mismatch]
> > > drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c:1411:1:
> > > error: conflicting types for 'vchiq_use_internal' due to
> > > enum/integer mismatch; have 'int(struct vchiq_state *, struct
> > > vchiq_service *, enum USE_TYPE_E)' [-Werror=enum-int-mismatch]
> > > drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c:1468:1:
> > > error: conflicting types for 'vchiq_release_internal' due to
> > > enum/integer mismatch; have 'int(struct vchiq_state *, struct
> > > vchiq_service *)' [-Werror=enum-int-mismatch]
> > >
> > > Change the declarations to match the actual function definition.
> > >
> > > Fixes: a9fbd828be7f ("staging: vchiq_arm: drop enum vchiq_status
> > > from vchiq_*_internal")
> > > Signed-off-by: Arnd Bergmann <arnd@...db.de>
> >
> > thanks for fixing this.
> >
> > Greg applied a series [1] from Umang which completely removes this enum
> > completely. This series has been applied to today and will likely cause
> > a conflict tomorrow in linux-next.
>
> Yes, the series was applied today.
>
> Has this patch (By Arnd) already applied to linux-next? I am not sure if I
> understand where the conflict will get originated ..
I've applied Arnd's patch to my staging-linus branch and it will go
there for 6.2-final. I'll handle the merge into my other branch when
that happens.
thanks,
greg k-h
Powered by blists - more mailing lists