Michal Kazior <michal.kazior@xxxxxxxxx> writes: > On 19 July 2013 13:07, Kalle Valo <kvalo@xxxxxxxxxxxxxxxx> wrote: >> Michal Kazior <michal.kazior@xxxxxxxxx> writes: >> >>> Hi, >>> >>> Here are some fixes for ath10k. The rts threshold >>> patch addresses my mistake in commit >>> 9aeb6fe53d1f0d6e58658484ce9ad7b59f0ef16b which >>> caused rts to be always enabled causing throughput >>> issues in some cases. >>> >>> >>> Michal Kazior (3): >>> ath10k: prevent HTC from being used after stopping >>> ath10k: fix memleak in mac setup >>> ath10k: fix rts/fragmentation threshold setup >> >> Doesn't apply: >> >> Applying: ath10k: prevent HTC from being used after stopping >> Applying: ath10k: fix memleak in mac setup >> Applying: ath10k: fix rts/fragmentation threshold setup >> fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath10k/mac.c). >> Repository lacks necessary blobs to fall back on 3-way merge. >> Cannot fall back to three-way merge. >> Patch failed at 0003 ath10k: fix rts/fragmentation threshold setup > > Eww. Sorry about that (I did warn you though). Perhaps that's because > you skipped one of the recovery patches that git is confused now. No worries. Most likely I could have fixed the conflict myself, but if 3-way merge doesn't work it's too much work. > I'll resend the whole patchset rebased and with the HTC patch fixed. Thanks. -- Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
