From: Kalle Valo <kvalo@codeaurora.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: <linux-wireless@vger.kernel.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Avraham Stern <avraham.stern@intel.com>,
Johannes Berg <johannes.berg@intel.com>,
Assaf Krauss <assaf.krauss@intel.com>,
Luca Coelho <luciano.coelho@intel.com>
Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with the net-next tree
Date: Mon, 11 Jul 2016 11:03:24 +0300 [thread overview]
Message-ID: <87vb0czjn7.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <20160711120614.0cdca5fa@canb.auug.org.au> (Stephen Rothwell's message of "Mon, 11 Jul 2016 12:06:14 +1000")
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/scan.c
>
> between commit:
>
> 7947d3e075cd ("mac80211: Add support for beacon report radio measurement")
>
> from the net-next tree and commit:
>
> 69e046423ad7 ("iwlwifi: mvm: change scan timeout to a delayed work")
>
> from the wireless-drivers-next tree.
>
> I fixed it up (see below) 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.
Thanks. I'm planning to submit a pull request to Dave tomorrow and I'll
include instruction how to solve these mac80211 API conflicts.
--
Kalle Valo
next prev parent reply other threads:[~2016-07-11 8:03 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-11 2:06 linux-next: manual merge of the wireless-drivers-next tree with the net-next tree Stephen Rothwell
2016-07-11 8:03 ` Kalle Valo [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-12-02 0:03 Stephen Rothwell
2016-12-02 5:08 ` Kalle Valo
[not found] <20160516101606.751f9613@canb.auug.org.au>
2016-05-16 13:10 ` Kalle Valo
2016-05-16 13:37 ` Coelho, Luciano
2016-05-16 13:58 ` Kalle Valo
2016-05-16 15:09 ` David Miller
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=87vb0czjn7.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@codeaurora.org \
--cc=assaf.krauss@intel.com \
--cc=avraham.stern@intel.com \
--cc=johannes.berg@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=luciano.coelho@intel.com \
--cc=sfr@canb.auug.org.au \
/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).