Amitkumar Karwar <akar...@marvell.com> writes: >> Doesn't apply anymore, please rebase. >> >> Applying: mwifiex: add PCIe function level reset support >> fatal: sha1 information is lacking or useless >> (drivers/net/wireless/marvell/mwifiex/main.c). >> Repository lacks necessary blobs to fall back on 3-way merge. >> Cannot fall back to three-way merge. >> Patch failed at 0001 mwifiex: add PCIe function level reset support > > It gets applied smoothly if below patches are applied first. > https://patchwork.kernel.org/patch/9310499/ ([v5,1/2] mwifiex: add > manufacturing mode support) > https://patchwork.kernel.org/patch/9310501/ ([v5,2/2] mwifiex: add cfg80211 > testmode support) > > Please let me know if you want me to rebase "PCIe function level reset > support". In that case I need to rebase and send above 2 patches as > well.
Yes, I was able to apply this after those patches. No need to resend. -- Kalle Valo
