From: Kalle Valo <kvalo@codeaurora.org>
To: Luciano Coelho <luciano.coelho@intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Wireless <linux-wireless@vger.kernel.org>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Haim Dreyfuss <haim.dreyfuss@intel.com>,
Shaul Triebitz <shaul.triebitz@intel.com>
Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree
Date: Thu, 26 Apr 2018 13:33:09 +0300 [thread overview]
Message-ID: <87a7tq6yvu.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <6f5ba028f120d092bd5c96557144750518faf9c1.camel@intel.com> (Luciano Coelho's message of "Thu, 26 Apr 2018 10:38:11 +0300")
Luciano Coelho <luciano.coelho@intel.com> writes:
> On Thu, 2018-04-26 at 11:09 +1000, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the wireless-drivers-next tree got a
>> conflict in:
>>
>> drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
>>
>> between commit:
>>
>> 77e30e10ee28 ("iwlwifi: mvm: query regdb for wmm rule if needed")
>>
>> from the wireless-drivers tree and commits:
>>
>> 9c4f7d512740 ("iwlwifi: move all NVM parsing code to the common
>> files")
>> 4c625c564ba2 ("iwlwifi: get rid of fw/nvm.c")
>>
>> 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 for resolving this, Stephen!
>
> I checked your resolution and it's spot on.
I now merged w-d to w-d-next to fix this, please check:
https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git/commit/?id=0ddcf3e76ae4d02918e609342a1020b50258fadd
I was not sure what to do with these includes so I left them in:
#include "fw/api/commands.h"
#include "fw/api/cmdhdr.h"
#include "fw/img.h"
--
Kalle Valo
next prev parent reply other threads:[~2018-04-26 10:33 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-26 1:09 linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree Stephen Rothwell
2018-04-26 7:38 ` Luciano Coelho
2018-04-26 10:33 ` Kalle Valo [this message]
2018-04-26 11:51 ` Luciano Coelho
-- 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-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
2019-04-18 13:49 ` Kalle Valo
2019-04-15 2:01 Stephen Rothwell
2019-04-18 13:49 ` Kalle Valo
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
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=87a7tq6yvu.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@codeaurora.org \
--cc=haim.dreyfuss@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 \
--cc=shaul.triebitz@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).