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 X-Spam-Level: X-Spam-Status: No, score=-2.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71BFAC10F14 for ; Thu, 3 Oct 2019 20:05:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 40AFD2086A for ; Thu, 3 Oct 2019 20:05:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570133117; bh=Nn6cWW/Kenu83QwvTBiQHXEQqGPjrxa3G1y333BHgPw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=uVuEt/xzY00nt6J+H/rZzIs5vf0TxBQxgsrvHFvHbApYluSVlA/r0Hscr/ITv2po0 XiVSSRVYWBni6lBqjEpsdDtTorBrH1CDrgqSRbCEPN6oUUmi4PBBWr/A9HF1u0+DYQ TpR8CIE7dsvZpUo0ieVm11LGg4URwHWI8Uzv66S8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733282AbfJCUFQ (ORCPT ); Thu, 3 Oct 2019 16:05:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:41558 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726677AbfJCUFQ (ORCPT ); Thu, 3 Oct 2019 16:05:16 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F3ABF2086A; Thu, 3 Oct 2019 20:05:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570133114; bh=Nn6cWW/Kenu83QwvTBiQHXEQqGPjrxa3G1y333BHgPw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=eIq3Foi55RROoA5LGnPyge8r+xF0BegL4LfV0JsfYXHbXBUxNdxfJHVuY8Hk6Ihar VGnqqmcGaW41UGElAB9/eUr5bY/vZ7Xum2uw4ixAEh3ooXI6GbUwSkUaIGlu1HffA1 bPcrdDRCqg/uUJ6PH6WncFqU3NdJwdDJw+ultOlE= Date: Thu, 3 Oct 2019 22:05:12 +0200 From: Greg Kroah-Hartman To: =?iso-8859-1?Q?Fran=E7ois?= Valenduc Cc: stable@vger.kernel.org Subject: Re: [PATCH 4.19 000/211] 4.19.77-stable review Message-ID: <20191003200512.GB3590105@kroah.com> References: <20191003154447.010950442@linuxfoundation.org> <20191003191016.GB3585751@kroah.com> <20191003192042.GA3587427@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20191003192042.GA3587427@kroah.com> User-Agent: Mutt/1.12.2 (2019-09-21) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Thu, Oct 03, 2019 at 09:20:42PM +0200, Greg Kroah-Hartman wrote: > On Thu, Oct 03, 2019 at 09:10:16PM +0200, Greg Kroah-Hartman wrote: > > On Thu, Oct 03, 2019 at 09:02:23PM +0200, François Valenduc wrote: > > > This does not compile. I get this error: > > > > > > CC drivers/ras/debugfs.o > > > drivers/ras/debugfs.c:9:5: error: redefinition of 'ras_userspace_consumers' > > > int ras_userspace_consumers(void) > > > ^~~~~~~~~~~~~~~~~~~~~~~ > > > In file included from drivers/ras/debugfs.c:2: > > > ./include/linux/ras.h:14:19: note: previous definition of > > > 'ras_userspace_consumers' was here > > > static inline int ras_userspace_consumers(void) { return 0; } > > > ^~~~~~~~~~~~~~~~~~~~~~~ > > > drivers/ras/debugfs.c:39:12: error: redefinition of 'ras_add_daemon_trace' > > > int __init ras_add_daemon_trace(void) > > > ^~~~~~~~~~~~~~~~~~~~ > > > In file included from drivers/ras/debugfs.c:2: > > > ./include/linux/ras.h:16:19: note: previous definition of > > > 'ras_add_daemon_trace' was here > > > static inline int ras_add_daemon_trace(void) { return 0; } > > > ^~~~~~~~~~~~~~~~~~~~ > > > drivers/ras/debugfs.c:55:13: error: redefinition of 'ras_debugfs_init' > > > void __init ras_debugfs_init(void) > > > ^~~~~~~~~~~~~~~~ > > > In file included from drivers/ras/debugfs.c:2: > > > ./include/linux/ras.h:15:20: note: previous definition of > > > 'ras_debugfs_init' was here > > > static inline void ras_debugfs_init(void) { } > > > ^~~~~~~~~~~~~~~~ > > > make[2]: *** [scripts/Makefile.build:304: drivers/ras/debugfs.o] Error 1 > > > make[1]: *** [scripts/Makefile.build:544: drivers/ras] Error 2 > > > make: *** [Makefile:1046: drivers] Error 2 > > > zsh: exit 2 LANG="C" make > > > > > > > > > Does somebody have an idea about this ? > > > > If you add b6ff24f7b510 ("RAS: Build debugfs.o only when enabled in > > Kconfig") to your tree, does that solve the issue? > > > > This should not be a new thing right? > > Yeah, the above should fix this for you. But again, is this a new > thing with this -rc release, or can you duplicate this in 4.19.76? Wait, I just dropped a ras patch from the queue, and your config file builds just fine for me. So I think that solves the issue here. I've pushed out a 4.19.77-rc2 with that fixed up, can you let me know if that solves the issue for you or not? thanks, greg k-h