[PATCH 1/4] ath10k: add WMI support for WOW

Kalle Valo kvalo at qca.qualcomm.com
Fri Mar 13 09:40:44 PDT 2015

Janusz Dziedzic <janusz.dziedzic at tieto.com> writes:

> Add WMI support for WOW like enable,
> wakeup events and host wakeup indication.
> Signed-off-by: Janusz Dziedzic <janusz.dziedzic at tieto.com>

Patch 1 had quite a few conflicts, please check carefully my resolution
in the pending branch.

Applying: ath10k: add WMI support for WOW
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
Auto-merging drivers/net/wireless/ath/ath10k/wmi-tlv.h
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-tlv.h
Auto-merging drivers/net/wireless/ath/ath10k/wmi-tlv.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-tlv.c
Auto-merging drivers/net/wireless/ath/ath10k/wmi-ops.h
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-ops.h
Failed to merge in the changes.
Patch failed at 0001 ath10k: add WMI support for WOW

Kalle Valo

More information about the ath10k mailing list