All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kalle Valo <kvalo@qca.qualcomm.com>
To: Michal Kazior <michal.kazior@tieto.com>
Cc: <ath10k@lists.infradead.org>, <linux-wireless@vger.kernel.org>
Subject: Re: [PATCH v2 1/2] ath10k: change dma beacon cmd prototype
Date: Thu, 29 Jan 2015 14:28:46 +0200	[thread overview]
Message-ID: <87zj9122kh.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <1422440525-11115-1-git-send-email-michal.kazior@tieto.com> (Michal Kazior's message of "Wed, 28 Jan 2015 11:22:04 +0100")

Michal Kazior <michal.kazior@tieto.com> writes:

> The command logic shouldn't really care about
> arvif structure.
>
> Signed-off-by: Michal Kazior <michal.kazior@tieto.com>

There was a conflict but 3-way merge automatically solved. Please check
the result any in the pending branch.

-- 
Kalle Valo

WARNING: multiple messages have this Message-ID (diff)
From: Kalle Valo <kvalo@qca.qualcomm.com>
To: Michal Kazior <michal.kazior@tieto.com>
Cc: linux-wireless@vger.kernel.org, ath10k@lists.infradead.org
Subject: Re: [PATCH v2 1/2] ath10k: change dma beacon cmd prototype
Date: Thu, 29 Jan 2015 14:28:46 +0200	[thread overview]
Message-ID: <87zj9122kh.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <1422440525-11115-1-git-send-email-michal.kazior@tieto.com> (Michal Kazior's message of "Wed, 28 Jan 2015 11:22:04 +0100")

Michal Kazior <michal.kazior@tieto.com> writes:

> The command logic shouldn't really care about
> arvif structure.
>
> Signed-off-by: Michal Kazior <michal.kazior@tieto.com>

There was a conflict but 3-way merge automatically solved. Please check
the result any in the pending branch.

-- 
Kalle Valo

_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k

  parent reply	other threads:[~2015-01-29 12:28 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-16 12:53 [PATCH 1/2] ath10k: change dma beacon cmd prototype Michal Kazior
2015-01-16 12:53 ` Michal Kazior
2015-01-16 12:53 ` [PATCH 2/2] ath10k: fix beacon deadlock Michal Kazior
2015-01-16 12:53   ` Michal Kazior
2015-01-24 16:24   ` Kalle Valo
2015-01-24 16:24     ` Kalle Valo
2015-01-26  8:13     ` Michal Kazior
2015-01-26  8:13       ` Michal Kazior
2015-01-28 10:22 ` [PATCH v2 1/2] ath10k: change dma beacon cmd prototype Michal Kazior
2015-01-28 10:22   ` Michal Kazior
2015-01-28 10:22   ` [PATCH v2 2/2] ath10k: fix beacon deadlock Michal Kazior
2015-01-28 10:22     ` Michal Kazior
2015-01-29 12:28   ` Kalle Valo [this message]
2015-01-29 12:28     ` [PATCH v2 1/2] ath10k: change dma beacon cmd prototype Kalle Valo
2015-02-04  7:18   ` Kalle Valo
2015-02-04  7:18     ` 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=87zj9122kh.fsf@kamboji.qca.qualcomm.com \
    --to=kvalo@qca.qualcomm.com \
    --cc=ath10k@lists.infradead.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=michal.kazior@tieto.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.