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=-3.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 3CE81C2BA19 for ; Mon, 13 Apr 2020 04:03:58 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id F324E206A1 for ; Mon, 13 Apr 2020 04:03:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="FwQw7AFf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F324E206A1 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=davemloft.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Mime-Version:References:In-Reply-To: From:Subject:To:Message-Id:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cWy30e+4KIKt2jV+jw5fpNCVeoKBzUp78ed+0JrCLLE=; b=FwQw7AFfNPDk8X fVn2ieBoO6kypHeEXF8DRmAEd81cReQ9tT3xaeR9OtbIZMqw5oLC7NbZkbDvVQWY7byN0nh96qbOf eCOH7gmM+bHhrUwsITwPjnnz+c07cZPkKPNHy+8eTiQttYkHr4BNbai6RhQK0YSr7OXjXiiqfufJS zOq8gaIa463wPmY/yNxEewSat/pWRVqaoK78CjSsEdcz5a6yFQyeEWcwMm0k3qr2u2xFGJW8Qw/4w UqwQWfk/pyzhjlqn6vaBxn7sBoX6467iJZjnmvPahoLx9yzFXoC1wwPoLPDacsZ32QgiWoEicBkAh 4az9R2v9GakhEOhSxYjg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jNqKC-00042Q-N1; Mon, 13 Apr 2020 04:03:56 +0000 Received: from shards.monkeyblade.net ([2620:137:e000::1:9]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jNqK9-00041W-He; Mon, 13 Apr 2020 04:03:55 +0000 Received: from localhost (unknown [IPv6:2601:601:9f00:477::3d5]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) (Authenticated sender: davem-davemloft) by shards.monkeyblade.net (Postfix) with ESMTPSA id F04C6127AE20A; Sun, 12 Apr 2020 21:03:42 -0700 (PDT) Date: Sun, 12 Apr 2020 21:03:41 -0700 (PDT) Message-Id: <20200412.210341.1711540878857604145.davem@davemloft.net> To: bp@alien8.de Subject: Re: [PATCH] net/3com/3c515: Fix MODULE_ARCH_VERMAGIC redefinition From: David Miller In-Reply-To: <20200411155623.GA22175@zn.tnic> References: <20200224085311.460338-1-leon@kernel.org> <20200224085311.460338-4-leon@kernel.org> <20200411155623.GA22175@zn.tnic> X-Mailer: Mew version 6.8 on Emacs 26.1 Mime-Version: 1.0 X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Sun, 12 Apr 2020 21:03:44 -0700 (PDT) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200412_210353_583877_761FA2DF X-CRM114-Status: UNSURE ( 7.60 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thor.thayer@linux.intel.com, heiko@sntech.de, irusskikh@marvell.com, andreas@gaisler.com, chris.snook@gmail.com, dave@thedillows.org, jes@trained-monkey.org, iyappan@os.amperecomputing.com, quan@os.amperecomputing.com, linux-acenic@sunsite.dk, andy@greyhouse.net, leon@kernel.org, akiyano@amazon.com, linux-rockchip@lists.infradead.org, wens@csie.org, LinoSanfilippo@gmx.de, vfalico@gmail.com, kuba@kernel.org, thomas.lendacky@amd.com, jcliburn@gmail.com, j.vosburgh@gmail.com, keyur@os.amperecomputing.com, mripard@kernel.org, leonro@mellanox.com, pcnet32@frontier.com, nios2-dev@lists.rocketboards.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, ionut@badula.org, netanel@amazon.com, mark.einon@gmail.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Borislav Petkov Date: Sat, 11 Apr 2020 17:56:23 +0200 > From: Borislav Petkov > > Change the include order so that MODULE_ARCH_VERMAGIC from the arch > header arch/x86/include/asm/module.h gets used instead of the fallback > from include/linux/vermagic.h and thus fix: > > In file included from ./include/linux/module.h:30, > from drivers/net/ethernet/3com/3c515.c:56: > ./arch/x86/include/asm/module.h:73: warning: "MODULE_ARCH_VERMAGIC" redefined > 73 | # define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY > | > In file included from drivers/net/ethernet/3com/3c515.c:25: > ./include/linux/vermagic.h:28: note: this is the location of the previous definition > 28 | #define MODULE_ARCH_VERMAGIC "" > | > > Fixes: 6bba2e89a88c ("net/3com: Delete driver and module versions from 3com drivers") > Signed-off-by: Borislav Petkov I'm so confused, that commit in the Fixes: tag is _removing_ code but adding new #include directives?!?! Is vermagic.h really needed in these files? _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel