All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kalle Valo <kvalo@qca.qualcomm.com>
To: Peter Oh <poh@qca.qualcomm.com>
Cc: linux-wireless@vger.kernel.org, ath10k@lists.infradead.org
Subject: Re: [PATCH 0/4] ath10k: rename mesh and add abstraction layer
Date: Thu, 28 Jan 2016 10:51:08 +0200	[thread overview]
Message-ID: <87vb6ekryb.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <1453920957-9908-1-git-send-email-poh@qca.qualcomm.com> (Peter Oh's message of "Wed, 27 Jan 2016 10:55:53 -0800")

Peter Oh <poh@qca.qualcomm.com> writes:

> Split Mesh service to 11s Mesh and non-11s Mesh according to
> firmware service bit to help users distinguish 11s Mesh from
> non 11s Mesh.
> And add abstraction layer for vdev subtype to solve subtype mismatch
> and to give flexible compatibility among different firmware revisions.
>
> Peter Oh (4):
>   ath10k: rename Mesh related service names
>   ath10k: update 10.4 WMI service map
>   ath10k: use vif->type and vif->p2p for P2P_GO check
>   ath10k: add abstraction layer for vdev subtype

There are conflicts, please rebase.

Applying: ath10k: rename Mesh related service names
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/ath/ath10k/wmi.h
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi.h
Auto-merging drivers/net/wireless/ath/ath10k/mac.c
Failed to merge in the changes.
Patch failed at 0001 ath10k: rename Mesh related service names

-- 
Kalle Valo

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

WARNING: multiple messages have this Message-ID (diff)
From: Kalle Valo <kvalo@qca.qualcomm.com>
To: Peter Oh <poh@qca.qualcomm.com>
Cc: <ath10k@lists.infradead.org>, <linux-wireless@vger.kernel.org>
Subject: Re: [PATCH 0/4] ath10k: rename mesh and add abstraction layer
Date: Thu, 28 Jan 2016 10:51:08 +0200	[thread overview]
Message-ID: <87vb6ekryb.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <1453920957-9908-1-git-send-email-poh@qca.qualcomm.com> (Peter Oh's message of "Wed, 27 Jan 2016 10:55:53 -0800")

Peter Oh <poh@qca.qualcomm.com> writes:

> Split Mesh service to 11s Mesh and non-11s Mesh according to
> firmware service bit to help users distinguish 11s Mesh from
> non 11s Mesh.
> And add abstraction layer for vdev subtype to solve subtype mismatch
> and to give flexible compatibility among different firmware revisions.
>
> Peter Oh (4):
>   ath10k: rename Mesh related service names
>   ath10k: update 10.4 WMI service map
>   ath10k: use vif->type and vif->p2p for P2P_GO check
>   ath10k: add abstraction layer for vdev subtype

There are conflicts, please rebase.

Applying: ath10k: rename Mesh related service names
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/ath/ath10k/wmi.h
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi.h
Auto-merging drivers/net/wireless/ath/ath10k/mac.c
Failed to merge in the changes.
Patch failed at 0001 ath10k: rename Mesh related service names

-- 
Kalle Valo

  parent reply	other threads:[~2016-01-28  8:51 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-27 18:55 [PATCH 0/4] ath10k: rename mesh and add abstraction layer Peter Oh
2016-01-27 18:55 ` Peter Oh
2016-01-27 18:55 ` [PATCH 1/4] ath10k: rename Mesh related service names Peter Oh
2016-01-27 18:55   ` Peter Oh
2016-01-27 18:55 ` [PATCH 2/4] ath10k: update 10.4 WMI service map Peter Oh
2016-01-27 18:55   ` Peter Oh
2016-01-27 18:55 ` [PATCH 3/4] ath10k: use vif->type and vif->p2p for P2P_GO check Peter Oh
2016-01-27 18:55   ` Peter Oh
2016-01-27 18:55 ` [PATCH 4/4] ath10k: add abstraction layer for vdev subtype Peter Oh
2016-01-27 18:55   ` Peter Oh
2016-01-27 19:11   ` Ben Greear
2016-01-27 19:11     ` Ben Greear
2016-01-27 21:44     ` Peter Oh
2016-01-27 21:44       ` Peter Oh
2016-01-27 19:39 ` [PATCH 0/4] ath10k: rename mesh and add abstraction layer Bob Copeland
2016-01-27 19:39   ` Bob Copeland
2016-01-27 21:53   ` Peter Oh
2016-01-27 21:53     ` Peter Oh
2016-01-28  2:04     ` Yeoh Chun-Yeow
2016-01-28  2:04       ` Yeoh Chun-Yeow
2016-01-28  5:12       ` Peter Oh
2016-01-28  5:12         ` Peter Oh
2016-01-28  8:51 ` Kalle Valo [this message]
2016-01-28  8:51   ` 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=87vb6ekryb.fsf@kamboji.qca.qualcomm.com \
    --to=kvalo@qca.qualcomm.com \
    --cc=ath10k@lists.infradead.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=poh@qca.qualcomm.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.