Re: linux-next: manual merge of the iwlwifi-next tree with Linus' tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 2852 bytes --]

Hi Johannes,

On Tue, 06 May 2025 08:26:31 +0200 Johannes Berg <johannes@sipsolutions.net> wrote:
>
> > Today's linux-next merge of the iwlwifi-next tree got conflicts in:
> > 
> >   drivers/net/wireless/intel/iwlwifi/cfg/sc.c
> >   drivers/net/wireless/intel/iwlwifi/iwl-config.h
> >   drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
> >   drivers/net/wireless/intel/iwlwifi/iwl-trans.c
> >   drivers/net/wireless/intel/iwlwifi/iwl-trans.h
> >   drivers/net/wireless/intel/iwlwifi/pcie/drv.c
> >   drivers/net/wireless/intel/iwlwifi/tests/devinfo.c
> > 
> > between various commits from Linus' tree and various commits from the
> > iwlwifi-next tree.  
> 
> Yeah, no surprise, there were some reverts in this area. The good thing
> is that we also already fixed the bugs that necessitated the reverts
> differently, so (eventually, need to check how much is in there now)
> this will just be "take next".

So, at your suggestion, I just used the latter versions of these files,
but I then got the following build failure:

In file included from arch/x86/include/asm/bug.h:103,
                 from include/linux/bug.h:5,
                 from include/linux/fortify-string.h:6,
                 from include/linux/string.h:392,
                 from include/linux/uuid.h:11,
                 from include/linux/mod_devicetable.h:14,
                 from include/linux/pci.h:27,
                 from drivers/net/wireless/intel/iwlwifi/pcie/trans.c:7:
drivers/net/wireless/intel/iwlwifi/pcie/trans.c: In function 'iwl_trans_pcie_reset':
drivers/net/wireless/intel/iwlwifi/pcie/trans.c:2337:29: error: 'IWL_RESET_MODE_BACKOFF' undeclared (first use in this function); did you mean 'IWL_RESET_MODE_REPROBE'?
 2337 |                     mode == IWL_RESET_MODE_BACKOFF))
      |                             ^~~~~~~~~~~~~~~~~~~~~~
include/asm-generic/bug.h:123:32: note: in definition of macro 'WARN_ON'
  123 |         int __ret_warn_on = !!(condition);                              \
      |                                ^~~~~~~~~
drivers/net/wireless/intel/iwlwifi/pcie/trans.c:2337:29: note: each undeclared identifier is reported only once for each function it appears in
 2337 |                     mode == IWL_RESET_MODE_BACKOFF))
      |                             ^~~~~~~~~~~~~~~~~~~~~~
include/asm-generic/bug.h:123:32: note: in definition of macro 'WARN_ON'
  123 |         int __ret_warn_on = !!(condition);                              \
      |                                ^~~~~~~~~

So, today I have merged the iwlwifi-next tree from next-20250505 (which
was effectively empty).  You may want to try merging the iwlwifi tree
into the iwlwifi-next tree and resolve any conflicts yourself (now that
the iwlwifi tree has been merged into Linus' tree).
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]