From: Kalle Valo <kvalo@codeaurora.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Johannes Berg <johannes@sipsolutions.net>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Xinming Hu <huxm@marvell.com>,
Avraham Stern <avraham.stern@intel.com>,
David Spinadel <david.spinadel@intel.com>,
Assaf Krauss <assaf.krauss@intel.com>,
Luca Coelho <luciano.coelho@intel.com>,
Amitkumar Karwar <akarwar@marvell.com>,
linux-wireless@vger.kernel.org
Subject: Re: linux-next: manual merge of the mac80211-next tree with the wireless-drivers-next tree
Date: Thu, 07 Jul 2016 19:10:24 +0300 [thread overview]
Message-ID: <874m812zv3.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <20160707115628.7fdac327@canb.auug.org.au> (Stephen Rothwell's message of "Thu, 7 Jul 2016 11:56:28 +1000")
(Adding linux-wireless)
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi Johannes,
>
> Today's linux-next merge of the mac80211-next tree got a conflict in:
>
> drivers/net/wireless/marvell/mwifiex/cmdevt.c
>
> between commit:
>
> a9c790ba23eb ("mwifiex: factor out mwifiex_cancel_scan")
>
> from the wireless-drivers-next tree and commit:
>
> 1d76250bd34a ("nl80211: support beacon report scanning")
>
> from the mac80211-next tree.
>
> I fixed it up (I used the wireless-drivers-next tree version of this file
> and then added the following merge fix patch) 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. When I send my pull request to Dave I'll let him know about this
conflict and propose to use your patch as the resolution.
Stephen, if it's not too much trouble for you it would be good to CC
linux-wireless on wireless related problems. Not everyone follow lkml
(or linux-next).
--
Kalle Valo
next prev parent reply other threads:[~2016-07-07 16:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-07 1:56 linux-next: manual merge of the mac80211-next tree with the wireless-drivers-next tree Stephen Rothwell
2016-07-07 5:49 ` Coelho, Luciano
2016-07-07 16:10 ` Kalle Valo [this message]
2016-07-08 0:34 ` 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=874m812zv3.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@codeaurora.org \
--cc=akarwar@marvell.com \
--cc=assaf.krauss@intel.com \
--cc=avraham.stern@intel.com \
--cc=david.spinadel@intel.com \
--cc=huxm@marvell.com \
--cc=johannes@sipsolutions.net \
--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