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>,
Johannes Berg <johannes.berg@intel.com>,
Luca Coelho <luciano.coelho@intel.com>
Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with Linus' tree
Date: Fri, 04 Aug 2017 09:36:26 +0300 [thread overview]
Message-ID: <87efsrn8k5.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <20170804120408.0d147e86@canb.auug.org.au> (Stephen Rothwell's message of "Fri, 4 Aug 2017 12:04:08 +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/ops.c
>
> between commit:
>
> bf8b286f86fc ("iwlwifi: mvm: defer setting IWL_MVM_STATUS_IN_HW_RESTART")
>
> from Linus' tree and commit:
>
> 7174beb60c53 ("iwlwifi: refactor firmware debug code")
>
> 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, the resolution looks good. I'll notify Dave about this when I
send the wireless-drivers-next pull request to him.
--
Kalle Valo
next prev parent reply other threads:[~2017-08-04 6:36 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-04 2:04 linux-next: manual merge of the wireless-drivers-next tree with Linus' tree Stephen Rothwell
2017-08-04 6:36 ` Kalle Valo [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-08-24 1:28 Stephen Rothwell
2017-08-24 1:24 Stephen Rothwell
2017-08-24 1:17 Stephen Rothwell
2017-08-24 1:32 ` Stephen Rothwell
2017-08-24 7:44 ` Kalle Valo
2015-12-07 3:13 Stephen Rothwell
2015-12-07 14:59 ` Kalle Valo
2015-12-07 17:51 ` Kalle Valo
2015-02-09 3:14 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=87efsrn8k5.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@codeaurora.org \
--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).