On Thu, Jun 18, 2015 at 09:20:51AM +0300, Kalle Valo wrote: > Vasanthakumar Thiagarajan <vthiagar@xxxxxxxxxxxxxxxx> writes: > > > This patch set adds changes for QCA99X0 chip in pci probe, > > Copy Engine init and firmware downloads. Since it is still > > work in progress the support for this chip is not yet > > advertised in pci device table. > > > > Vasanthakumar Thiagarajan (10): > > ath10k: Add a table to store hw specific values > > ath10k: Add new reg_address/mask to hw register table > > ath10k: Add hw register/values for QCA99X0 chip > > ath10k: Copy Engine related changes for QCA99X0 > > ath10k: Make target cpu address to CE address conversion chip specific > > ath10k: Add chip reset sequence for QCA99X0 > > ath10k: Extend CE src desc flags for interrupt indication > > ath10k: Fix BMI communication timeout for QCA99X0 > > ath10k: Add support for code swap > > ath10k: Add BMI param value to execute otp to hw_param > > These patches don't apply and don't have proper sha1 ids. Please rebase. > And remember always to use ath.git master branch as the baseline, don't > apply any custom patches because that will break 3-way merge. > > Applying: ath10k: Add a table to store hw specific values > Applying: ath10k: Add new reg_address/mask to hw register table > Applying: ath10k: Add hw register/values for QCA99X0 chip > fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath10k/core.c). > Repository lacks necessary blobs to fall back on 3-way merge. > Cannot fall back to three-way merge. > Patch failed at 0003 ath10k: Add hw register/values for QCA99X0 chip Sorry about this. Im sending the rebased patches on top of ath.git master tot Vasanth -- 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
