Subject: linux-next: manual merge of the kspp tree with the wireless-drivers-next tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 28 Oct 2021 19:29:34 +1100

Hi all,

Today's linux-next merge of the kspp tree got a conflict in:

  drivers/net/wireless/intel/iwlwifi/fw/api/tx.h

between commit:

  dc52fac37c87 ("iwlwifi: mvm: Support new TX_RSP and COMPRESSED_BA_RES versions")

from the wireless-drivers-next tree and commit:

  fa7845cfd53f ("treewide: Replace open-coded flex arrays in unions")

from the kspp tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/wireless/intel/iwlwifi/fw/api/tx.h
index 9b3bce83efb6,5fddfd391941..000000000000
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/tx.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/tx.h
@@@ -720,10 -715,11 +722,12 @@@ struct iwl_mvm_compressed_ba_notif 
  	__le32 tx_rate;
  	__le16 tfd_cnt;
  	__le16 ra_tid_cnt;
- 	struct iwl_mvm_compressed_ba_ratid ra_tid[0];
- 	struct iwl_mvm_compressed_ba_tfd tfd[];
+ 	union {
+ 		DECLARE_FLEX_ARRAY(struct iwl_mvm_compressed_ba_ratid, ra_tid);
+ 		DECLARE_FLEX_ARRAY(struct iwl_mvm_compressed_ba_tfd, tfd);
+ 	};
 -} __packed; /* COMPRESSED_BA_RES_API_S_VER_4 */
 +} __packed; /* COMPRESSED_BA_RES_API_S_VER_4,
 +	       COMPRESSED_BA_RES_API_S_VER_5 */
  
  /**
   * struct iwl_mac_beacon_cmd_v6 - beacon template command