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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20190415120133.40c0f343@canb.auug.org.au>
Date:   Mon, 15 Apr 2019 12:01:33 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Kalle Valo <kvalo@...eaurora.org>,
        Wireless <linux-wireless@...r.kernel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Shahar S Matityahu <shahar.s.matityahu@...el.com>,
        Luca Coelho <luciano.coelho@...el.com>
Subject: linux-next: manual merge of the wireless-drivers-next tree with the
 wireless-drivers tree

Hi all,

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

  drivers/net/wireless/intel/iwlwifi/iwl-trans.h

between commit:

  07d35b4270ef ("iwlwifi: use sync nmi in case of init flow failure")

from the wireless-drivers tree and commit:

  4b1831e48974 ("iwlwifi: dbg_ini: support HW error trigger")

from the wireless-drivers-next 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/iwl-trans.h
index d8690acee40c,2235978adf70..000000000000
--- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
@@@ -830,6 -831,8 +830,7 @@@ struct iwl_trans 
  	u32 lmac_error_event_table[2];
  	u32 umac_error_event_table;
  	unsigned int error_event_table_tlv_status;
 -	wait_queue_head_t fw_halt_waitq;
+ 	bool hw_error;
  
  	/* pointer to trans specific struct */
  	/*Ensure that this pointer will always be aligned to sizeof pointer */

Content of type "application/pgp-signature" skipped