From: "Russell King (Oracle)" <linux@armlinux.org.uk>
To: Ard Biesheuvel <ardb@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>, kernel test robot <lkp@intel.com>,
llvm@lists.linux.dev, oe-kbuild-all@lists.linux.dev,
linux-arm-kernel@lists.infradead.org
Subject: Re: [arm:for-next 4/4] arch/arm/vfp/vfpmodule.c:324:13: error: static declaration of 'VFP_bounce' follows non-static declaration
Date: Tue, 15 Aug 2023 10:05:24 +0100 [thread overview]
Message-ID: <ZNs/1GB10P1zq5bU@shell.armlinux.org.uk> (raw)
In-Reply-To: <CAMj1kXE_Rehybm_ANRYcDqPT8q7SPJ_Yxw9HLNNg9SsmTk17zA@mail.gmail.com>
On Tue, Aug 15, 2023 at 10:39:31AM +0200, Ard Biesheuvel wrote:
> On Tue, 15 Aug 2023 at 00:16, Arnd Bergmann <arnd@arndb.de> wrote:
> >
> > On Tue, Aug 15, 2023, at 00:08, Russell King (Oracle) wrote:
> > > On Tue, Aug 15, 2023 at 05:06:03AM +0800, kernel test robot wrote:
> > >> 1 error generated.
> > >
> > > I'm guessing this is a conflict between Arnd's patch
> > >
> > > ae1f8d793a19 ("ARM: 9304/1: add prototype for function called only from asm")
> > >
> > > merged in v6.5-rc1 and Ard's patch, and that part of Arnd's patch
> > > needs to be reverted since VFP_bounce is now static. Agreed?
> >
> > Yes, with Ard's change, the prototype I added is neither required nor correct.
> >
> > My series contained another patch that added a prototype for
> > vfp_entry(), and this is also obsoleted by Ard's series, but you
> > did not merge it anyway, so it's all good on that one.
> >
>
> When you sent out that series, I mentioned the conflict with
> vfp_entry() [13/16], but I failed to spot that the same series had
> another patch that added the VFP_bounce() declaration, which is the
> one that is now conflicting.
>
> So we just need a patch that drops the VFP_bounce() declaration,
> right? Should I send that out and drop it into the patch system?
http://git.armlinux.org.uk/cgit/linux-arm.git/commit/?h=for-next&id=a6f307c20d649e5f1da280bee7ed160de74de2ff
Thanks.
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-08-15 9:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-14 21:06 [arm:for-next 4/4] arch/arm/vfp/vfpmodule.c:324:13: error: static declaration of 'VFP_bounce' follows non-static declaration kernel test robot
2023-08-14 22:08 ` Russell King (Oracle)
2023-08-14 22:15 ` Arnd Bergmann
2023-08-15 8:39 ` Ard Biesheuvel
2023-08-15 9:05 ` Russell King (Oracle) [this message]
2023-08-15 16:18 ` Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZNs/1GB10P1zq5bU@shell.armlinux.org.uk \
--to=linux@armlinux.org.uk \
--cc=ardb@kernel.org \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=lkp@intel.com \
--cc=llvm@lists.linux.dev \
--cc=oe-kbuild-all@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).