WSL2-Linux-Kernel/drivers/net/wireless/ath/ath10k
David S. Miller ff24e4980a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three trivial overlapping conflicts.

Signed-off-by: David S. Miller <davem@davemloft.net>
2019-05-02 22:14:21 -04:00
..
Kconfig ath10k: remove work in progress logs from snoc driver 2018-12-20 19:03:15 +02:00
Makefile ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
ahb.c ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
ahb.h ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
bmi.c ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
bmi.h ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
ce.c ath10k: perform crash dump collection in workqueue 2019-04-29 17:24:37 +03:00
ce.h ath10k: fix descriptor size in ce tx completion for WCN3990 2019-02-26 14:56:19 +02:00
core.c ath10k: perform crash dump collection in workqueue 2019-04-29 17:24:37 +03:00
core.h ath10k: perform crash dump collection in workqueue 2019-04-29 17:24:37 +03:00
coredump.c ath10k: perform crash dump collection in workqueue 2019-04-29 17:24:37 +03:00
coredump.h ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
debug.c ath10k: remove the calibration data fetch for sdio 2019-02-26 15:05:26 +02:00
debug.h ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
debugfs_sta.c ath10k: Fix the wrong updation of BW in tx_stats debugfs entry 2019-02-28 10:46:06 +02:00
hif.h ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
htc.c ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
htc.h ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
htt.c ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
htt.h ath10k: add support for ack rssi value of data tx packets 2019-02-26 14:58:06 +02:00
htt_rx.c mac80211: make ieee80211_schedule_txq schedule empty TXQs 2019-04-08 13:31:31 +02:00
htt_tx.c ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
hw.c ath10k: add support for ack rssi value of data tx packets 2019-02-26 14:58:06 +02:00
hw.h ath10k: update the max num of peers supported for WCN3990 2019-02-26 15:06:38 +02:00
mac.c ath10k: Drop WARN_ON()s that always trigger during system resume 2019-04-29 17:26:14 +03:00
mac.h ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
p2p.c ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
p2p.h ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
pci.c ath10k: perform crash dump collection in workqueue 2019-04-29 17:24:37 +03:00
pci.h ath10k: perform crash dump collection in workqueue 2019-04-29 17:24:37 +03:00
qmi.c ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
qmi.h ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
qmi_wlfw_v01.c ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
qmi_wlfw_v01.h ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
rx_desc.h ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
sdio.c ath10k: sdio: reset chip on power_down() 2019-02-26 15:02:08 +02:00
sdio.h ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
snoc.c ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
snoc.h ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
spectral.c ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
spectral.h ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
swap.c ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
swap.h ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
targaddrs.h ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
testmode.c netlink: make validation more configurable for future strictness 2019-04-27 17:07:21 -04:00
testmode.h ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
testmode_i.h ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
thermal.c ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
thermal.h ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
trace.c ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
trace.h ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
txrx.c ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
txrx.h ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
usb.c ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
usb.h ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
wmi-ops.h ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
wmi-tlv.c ath10k: Fill rx duration for each peer in fw_stats for WCN3990 2019-02-28 10:48:19 +02:00
wmi-tlv.h ath10k: Fill rx duration for each peer in fw_stats for WCN3990 2019-02-28 10:48:19 +02:00
wmi.c ath10k: Fill rx duration for each peer in fw_stats for WCN3990 2019-02-28 10:48:19 +02:00
wmi.h ath10k: Fill rx duration for each peer in fw_stats for WCN3990 2019-02-28 10:48:19 +02:00
wow.c ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00
wow.h ath10k: switch to use SPDX license identifiers 2019-02-20 10:33:00 +02:00