On Mon, May 11, 2020 at 3:10 PM Kalle Valo <kvalo@xxxxxxxxxxxxxx> wrote: > > Arnd Bergmann <arnd@xxxxxxxx> writes: > > > On Mon, May 11, 2020 at 2:03 PM Kalle Valo <kvalo@xxxxxxxxxxxxxx> wrote: > >> "Gustavo A. R. Silva" <gustavoars@xxxxxxxxxx> writes: > > > >> > > >> > This treewide patch no longer contains changes for ath10k. I removed them > >> > since Monday (05/04/2020). So, this "Fixes" tag does not apply. > > > > Oops, I forgot to update the changelog trext when rebasing. > > > >> Ok, I'll remove it. Also I'll take these to my ath.git tree, not to > >> net-next. > > > > Thanks a lot! > > Weird, I had a conflict with this patch but couldn't figure out why. > Anyway, I fixed it in my pending branch and please double check: > > https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=c3e5221f3c3ddabc76a33ff08440ff1dc664998d Looks good to me. It may have been an artifact on my side, as I have applied and later reverted Gustavo's patch on the same branch. Arnd