From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the wireless-drivers-next tree with Linus' tree Date: Thu, 24 Aug 2017 11:28:25 +1000 Message-ID: <20170824112825.29c2f8a0@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from ozlabs.org ([103.22.144.67]:47559 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750715AbdHXB21 (ORCPT ); Wed, 23 Aug 2017 21:28:27 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: Kalle Valo , Wireless Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Emmanuel Grumbach , Luca Coelho 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