Subject: Re: mainline build failure due to c1918196427b ("iwlwifi: pcie: simplify MSI-X cause mapping")

From: Kalle Valo <[email-masked]>
Date: Fri, 27 May 2022 12:20:55 +0300

Sudip Mukherjee <[email-masked]> 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