linux-kernel - linux-next: manual merge of the wireless-drivers-next tree with Linus' 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>] [day] [month] [year] [list]

Message-ID: <20170824112825.29c2f8a0@canb.auug.org.au>
Date:   Thu, 24 Aug 2017 11:28:25 +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>,
        Emmanuel Grumbach <emmanuel.grumbach@...el.com>,
        Luca Coelho <luciano.coelho@...el.com>
Subject: linux-next: manual merge of the wireless-drivers-next tree with
 Linus' tree

Hi all,

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

  drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c

between commit:

  a600852a9d00 ("iwlwifi: mvm: don't WARN when a legit race happens in A-MPDU")

from Linus' tree and commit:

  790e663433d8 ("iwlwifi: mvm: include more debug data when we get an unexpected baid")

from the wireless-drivers-next tree.

I fixed it up (I just used the former) 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