From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F185BC0015E for ; Tue, 15 Aug 2023 09:06:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=qvL594HoSj5zyGqb7Xojqi16M6sqhYW3SC4u287kopI=; b=J6UjVzJAmE6Lpa kYJ2MWF3M5yzEDuT3abtQ9pYFT6ZSAw2+MPzcb2/z6tbLfpGU4HJnw29F3LRgjZlf0c7skYFeTYKA OBtEiFe5EWHfuIN3/2r0mNnlIQQ6Rdo1+xvu/nlW5bcbVhNqxsEdTWIzQ/AGt5eHXlUnncxbsYXOw dPcKVFy/ULtsgT0e9oeUbgcNJcQ2s34ZygFnINYYkzikBPv5oecKaqp+q10jYgQbF6tFs6JhP+EcJ YvQA8tcUAxTE5tgBWHWPuR27AkMKejUqYH7mYgVjw9dNv3E2oCBnFlyteyT330eDtq4keIimOnlb2 VltguE0UEBcB3zRtZGjg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qVpzl-001B9I-07; Tue, 15 Aug 2023 09:05:45 +0000 Received: from [2001:4d48:ad52:32c8:5054:ff:fe00:142] (helo=pandora.armlinux.org.uk) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qVpzg-001B7Z-1d for linux-arm-kernel@lists.infradead.org; Tue, 15 Aug 2023 09:05:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Sender:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=hO6nMsAjIrauPmSG8esEq0mx0nDka42aMxFu0e4IIHw=; b=A1y+Xzc6JdVnOO/+zhLQor3FCv 9SDtnAQI5XFc3t47zPterpIh8EkB2fOEnAs7gHwxSFpD00jyN3fFmvJ6TnEXdWrlHBcjzUlYQNA6T fGNqjOvDqTtyBYUnLzRExIEZKXlcTHf+263EFT5ASNhS4zID0MIDCFWHbqgxAm5eMgJav17I7qpHb DOvFKoPODNXbjxQdqDFetseQzsZ8P00sWlgWXsH9opfjslPLYlPK3YY6IzcascMZp+fjvBB6yPVDG p7HifaP3xak7Xbk+MbuBGWDIWoVzbqG6kgH0xqCJF2a/wGniGLXx0sBvErX4o1+T77TTm8B3gJjMN BLH33+DQ==; Received: from shell.armlinux.org.uk ([fd8f:7570:feb6:1:5054:ff:fe00:4ec]:59246) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1qVpzR-0001Le-1P; Tue, 15 Aug 2023 10:05:25 +0100 Received: from linux by shell.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1qVpzQ-0006qq-Fb; Tue, 15 Aug 2023 10:05:24 +0100 Date: Tue, 15 Aug 2023 10:05:24 +0100 From: "Russell King (Oracle)" To: Ard Biesheuvel Cc: Arnd Bergmann , kernel test robot , 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 Message-ID: References: <202308150547.m54XHV12-lkp@intel.com> <7dfa4337-fc2f-4a02-a12e-f94feca7362b@app.fastmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230815_020540_809823_B4502EE8 X-CRM114-Status: GOOD ( 22.93 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Aug 15, 2023 at 10:39:31AM +0200, Ard Biesheuvel wrote: > On Tue, 15 Aug 2023 at 00:16, Arnd Bergmann 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