From: Kalle Valo <kvalo@codeaurora.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Wireless <linux-wireless@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Ayala Beker <ayala.beker@intel.com>,
Tova Mussai <tova.mussai@intel.com>
Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree
Date: Thu, 31 Oct 2019 11:36:11 +0200 [thread overview]
Message-ID: <87pnid1cl0.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <20191031111242.50ab1eca@canb.auug.org.au> (Stephen Rothwell's message of "Thu, 31 Oct 2019 11:13:03 +1100")
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in:
>
> drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
>
> between commit:
>
> 3d206e6899a0 ("iwlwifi: fw api: support new API for scan config cmd")
>
> from the wireless-drivers tree and commit:
>
> 65b9425ce9aa ("iwlwifi: rx: use new api to get band from rx mpdu")
>
> from the wireless-drivers-next tree.
Thanks, the resolution looked simple enough so I'm not taking any extra
actions because of this (for example merging wireless-drivers to
wireless-drivers-next etc).
--
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
next prev parent reply other threads:[~2019-10-31 9:36 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-31 0:13 linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree Stephen Rothwell
2019-10-31 9:36 ` Kalle Valo [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-03-24 0:16 Stephen Rothwell
2020-03-24 7:00 ` Kalle Valo
2020-03-24 7:29 ` Luca Coelho
2020-03-24 8:07 ` Kalle Valo
2019-04-30 4:08 Stephen Rothwell
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-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 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=87pnid1cl0.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@codeaurora.org \
--cc=ayala.beker@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tova.mussai@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.