[ath9k-devel] [PATCH v2 0/6] ath10k: pci cleanup

[Kalle Valo <kvalo@qca.qualcomm.com>]

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

> This gets rid of the ugly device/target resetting
> retries. It also tries to simplify pci probing
> logic.
>
> v2: fixes MSI-X and legacy interrupts
>     adds/changes a few prints
>
> Michal Kazior (6):
>   ath10k: fix pci_set_drvpriv ordering
>   ath10k: refactor pci interrupt functions
>   ath10k: remove pci probe retrying
>   ath10k: remove ath10k_pci_configure()
>   ath10k: remove ath10k_pci_probe_device()
>   ath10k: simplify pci target reset

Applying: ath10k: remove pci probe retrying
fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath10k/pci.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0003 ath10k: remove pci probe retrying

I didn't want to start manually fixing the conflict, so can you please
rebase? And please double check how you submit patches, git still
complains about invalid ids. Of course it might be something on my end,
but your patches are the only ones with which I have noticed this
problem.

-- 
Kalle Valo