From: Michal Kazior <michal.kazior@tieto.com>
To: Kalle Valo <kvalo@codeaurora.org>
Cc: David Miller <davem@davemloft.net>,
linux-wireless <linux-wireless@vger.kernel.org>,
Network Development <netdev@vger.kernel.org>
Subject: Re: pull-request: wireless-drivers-next 2015-05-21
Date: Fri, 22 May 2015 14:38:05 +0200 [thread overview]
Message-ID: <CA+BoTQneUoKq_Gh=A=-=RLn7TUrfdAm8UwQkUvJGgBDDwaqKpA@mail.gmail.com> (raw)
In-Reply-To: <87r3q84x1j.fsf@kamboji.qca.qualcomm.com>
On 22 May 2015 at 14:27, Kalle Valo <kvalo@codeaurora.org> wrote:
> Michal Kazior <michal.kazior@tieto.com> writes:
>> On 21 May 2015 at 15:39, Kalle Valo <kvalo@codeaurora.org> wrote:
[...]
>>> + static int ath10k_vdev_start_restart(struct ath10k_vif *arvif,
>>> + const struct cfg80211_chan_def *chandef,
>>> + bool restart)
>>> {
>>> struct ath10k *ar = arvif->ar;
>>> - struct cfg80211_chan_def *chandef = &ar->chandef;
>>> struct wmi_vdev_start_request_arg arg = {};
>>> - int ret = 0, ret2;
>>> + int ret = 0;
>>>
>>> lockdep_assert_held(&ar->conf_mutex);
>>>
>>
>> Kalle, I'm not seeing this when I merge your pull tag on top of
>> net-next/master. Am I missing something?
>
> You lost me, you are not seeing what?
Your merge resolution diff seems to include stuff regarding
ath10k_vdev_stop(). I didn't see it when I tried the merge and had
only 2 conflicts: the promisc code and at feature flags (XMIT_FAST).
> I think we have a misunderstanding
That's possible.
> here, let me explain how I created that diff:
>
> git clone --reference ~/linux-2.6/ git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
> cd net-next/
> git pull git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git tags/wireless-drivers-next-for-davem-2015-05-21
> emacs drivers/net/wireless/ath/ath10k/mac.c
> git diff > resolution.txt
For what it's worth I did:
git checkout net-next/master
git merge wireless-drivers-next-for-davem-2015-05-21
# fix conflicts
git commit -a
git show
Merge should essentially yield the same result as your pull.
Michał
next prev parent reply other threads:[~2015-05-22 12:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-21 13:39 pull-request: wireless-drivers-next 2015-05-21 Kalle Valo
2015-05-22 10:16 ` Michal Kazior
2015-05-22 12:27 ` Kalle Valo
2015-05-22 12:38 ` Michal Kazior [this message]
2015-05-25 3:29 ` David Miller
2015-05-25 10:57 ` Kalle Valo
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='CA+BoTQneUoKq_Gh=A=-=RLn7TUrfdAm8UwQkUvJGgBDDwaqKpA@mail.gmail.com' \
--to=michal.kazior@tieto.com \
--cc=davem@davemloft.net \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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).