From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kalle Valo <kvalo@codeaurora.org>,
Wireless <linux-wireless@vger.kernel.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Emmanuel Grumbach <emmanuel.grumbach@intel.com>,
Luca Coelho <luciano.coelho@intel.com>
Subject: linux-next: manual merge of the wireless-drivers-next tree with Linus' tree
Date: Thu, 24 Aug 2017 11:28:25 +1000 [thread overview]
Message-ID: <20170824112825.29c2f8a0@canb.auug.org.au> (raw)
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
next reply other threads:[~2017-08-24 1:28 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-24 1:28 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-08-24 1:24 linux-next: manual merge of the wireless-drivers-next tree with Linus' tree Stephen Rothwell
2017-08-24 1:17 Stephen Rothwell
2017-08-24 1:32 ` Stephen Rothwell
2017-08-24 7:44 ` Kalle Valo
2017-08-04 2:04 Stephen Rothwell
2017-08-04 6:36 ` Kalle Valo
2015-12-07 3:13 Stephen Rothwell
2015-12-07 14:59 ` Kalle Valo
2015-12-07 17:51 ` Kalle Valo
2015-02-09 3:14 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170824112825.29c2f8a0@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=emmanuel.grumbach@intel.com \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=luciano.coelho@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).