From: Kalle Valo <kvalo@qca.qualcomm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Vivek Natarajan <nataraja@qti.qualcomm.com>,
Rajkumar Manoharan <rmanohar@qti.qualcomm.com>,
linux-wireless@vger.kernel.org
Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with Linus' tree
Date: Mon, 7 Dec 2015 19:51:35 +0200 [thread overview]
Message-ID: <874mfucfko.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <87r3iycnj4.fsf@kamboji.qca.qualcomm.com> (Kalle Valo's message of "Mon, 07 Dec 2015 16:59:43 +0200")
Kalle Valo <kvalo@codeaurora.org> writes:
> 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/ath/ath10k/pci.c
>>
>> between commit:
>>
>> 6419fdbb6f90 ("ath10k: poll HTT send completion when CE 5 is unused")
>>
>> from Linus' tree and commit:
>>
>> afb0bf7f530b ("ath10k: add support for pktlog in QCA99X0")
>>
>> from the wireless-drivers-next tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
>
> Thanks, the fix looks good to me.
BTW, this conflict should be fixed once Dave merges my
wireless-drivers-next pull request.
--
Kalle Valo
next prev parent reply other threads:[~2015-12-07 17:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-07 3:13 linux-next: manual merge of the wireless-drivers-next tree with Linus' tree Stephen Rothwell
2015-12-07 14:59 ` Kalle Valo
2015-12-07 17:51 ` 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
2017-08-04 2:04 Stephen Rothwell
2017-08-04 6:36 ` 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=874mfucfko.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@qca.qualcomm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=nataraja@qti.qualcomm.com \
--cc=rmanohar@qti.qualcomm.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).