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>,
Luca Coelho <luciano.coelho@intel.com>
Subject: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree
Date: Tue, 24 Mar 2020 11:16:53 +1100 [thread overview]
Message-ID: <20200324111653.35c368e4@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 965 bytes --]
Hi all,
Today's linux-next merge of the wireless-drivers-next tree got a
conflict in:
drivers/net/wireless/intel/iwlwifi/pcie/drv.c
between commit:
cf52c8a776d1 ("iwlwifi: pcie: add 0x2526/0x401* devices back to cfg detection")
from the wireless-drivers tree and commits:
67eb556da609 ("iwlwifi: combine 9260 cfgs that only change names")
d6f2134a3831 ("iwlwifi: add mac/rf types and 160MHz to the device tables")
from the wireless-drivers-next tree.
I fixed it up (I am not sure wat to do with this, so I just dropped
the former changes for now) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-03-24 0:17 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-24 0:16 Stephen Rothwell [this message]
2020-03-24 7:00 ` linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree Kalle Valo
2020-03-24 7:29 ` Luca Coelho
2020-03-24 8:07 ` Kalle Valo
-- strict thread matches above, loose matches on Subject: below --
2019-10-31 0:13 Stephen Rothwell
2019-10-31 9:36 ` Kalle Valo
2019-04-30 4:08 Stephen Rothwell
2019-04-30 5:30 ` Luciano Coelho
2019-04-15 2:08 Stephen Rothwell
[not found] ` <20190415120853.39e0e46a-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2019-04-18 13:49 ` Kalle Valo
2019-04-15 2:01 Stephen Rothwell
2019-04-18 13:49 ` Kalle Valo
2018-04-26 1:09 Stephen Rothwell
[not found] ` <20180426110917.446204af-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2018-04-26 7:38 ` Luciano Coelho
2018-04-26 10:33 ` Kalle Valo
2018-04-26 11:51 ` Luciano Coelho
2017-12-08 1:00 Stephen Rothwell
2017-12-08 12:30 ` Kalle Valo
2017-10-12 17:25 Mark Brown
2017-10-12 18:16 ` Luciano Coelho
2017-10-12 18:21 ` Mark Brown
2017-10-12 18:27 ` Luciano Coelho
2017-10-12 18:35 ` Mark Brown
2017-10-12 18:50 ` Luca Coelho
2017-10-12 18:59 ` Mark Brown
2017-10-12 19:02 ` Luca Coelho
2017-10-12 18:29 ` Luca Coelho
2017-10-12 19:12 ` Mark Brown
2017-10-12 17:20 Mark Brown
2017-10-12 17:14 Mark Brown
2015-05-25 3:07 Stephen Rothwell
2015-06-01 9:15 ` Geert Uytterhoeven
2015-01-16 4:20 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=20200324111653.35c368e4@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--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).