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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D734AC433EF for ; Fri, 27 May 2022 09:21:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349876AbiE0JVN (ORCPT ); Fri, 27 May 2022 05:21:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231964AbiE0JVH (ORCPT ); Fri, 27 May 2022 05:21:07 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ECF236AA6B; Fri, 27 May 2022 02:21:04 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id A8F55B823D0; Fri, 27 May 2022 09:21:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E4F2C385A9; Fri, 27 May 2022 09:20:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653643262; bh=ez+vHDC1JZcB/q4Ew/Nyp1xMVHDbgDrO5Einjt3rI1Y=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=Fp0qRcCM5reRtgw54xqvPVkW6BPvu4O4gz4OU03NnufzAV4is8i2DjZoOq1zQb8c2 UjvtzMWfTZC8s2apsETWVIzqv60bTNo3unCIl+va6LKfel6wdoK0jx2cNL6O3iwWJv n3pwSTz7j5c40e52EJizBgJoxqwF//PPnf4CsBYbn00yREr6BRobJQZAMAsFI808RS Mp42fs4uyS5Zp3R4sXMzZFgXAxpWSam3vEuKwagyq2yYpzF7MhZLOZjIELWLiVEuHj gnt5g/ARK2DT3sp/hzSbxY/I/BOOZ2rfhGVrITvAdA0VoQ3aFzNMsstZOqvkjLOCcf PoCZ35692YRRA== From: Kalle Valo To: Sudip Mukherjee Cc: Johannes Berg , Gregory Greenman , Luca Coelho , "David S. Miller" , Jakub Kicinski , Paolo Abeni , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org Subject: Re: mainline build failure due to c1918196427b ("iwlwifi: pcie: simplify MSI-X cause mapping") References: Date: Fri, 27 May 2022 12:20:55 +0300 In-Reply-To: (Sudip Mukherjee's message of "Fri, 27 May 2022 10:13:06 +0100") Message-ID: <875ylrqqko.fsf@kernel.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Sudip Mukherjee writes: > The latest mainline kernel branch fails to build for mips allmodconfig > with the error: > > drivers/net/wireless/intel/iwlwifi/pcie/trans.c:1093: error: "CAUSE" redefined [-Werror] > 1093 | #define CAUSE(reg, mask) \ > | > In file included from ./arch/mips/include/asm/ptrace.h:19, > from ./include/linux/sched/signal.h:14, > from ./include/linux/rcuwait.h:6, > from ./include/linux/percpu-rwsem.h:7, > from ./include/linux/fs.h:33, > from ./arch/mips/include/asm/elf.h:12, > from ./include/linux/elf.h:6, > from ./include/linux/module.h:19, > from ./include/linux/device/driver.h:21, > from ./include/linux/device.h:32, > from ./include/linux/pci.h:37, > from drivers/net/wireless/intel/iwlwifi/pcie/trans.c:7: > ./arch/mips/include/uapi/asm/ptrace.h:18: note: this is the location of the previous definition > 18 | #define CAUSE 65 > > git bisect pointed to c1918196427b ("iwlwifi: pcie: simplify MSI-X cause mapping") > > And, reverting it on top of mainline branch has fixed the build failure. We have a fix: iwlwifi: pcie: rename CAUSE macro https://patchwork.kernel.org/project/linux-wireless/patch/20220523220300.682be2029361.I283200b18da589a975a284073dca8ed001ee107a@changeid/ It's marked as accepted but I don't know where it's applied to, Gregory? This is failing the build, should Linus apply the fix directly to his tree? -- https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches