Re: pull-request: wireless-drivers-next 2015-05-21

On 22 May 2015 at 14:27, Kalle Valo [off-list ref] wrote:

Michal Kazior [off-list ref] writes:

quoted

On 21 May 2015 at 15:39, Kalle Valo [off-list ref] wrote:

[...]

quoted

quoted

+ 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ł
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html