> From: Kalle Valo [mailto:kvalo@xxxxxxxxxxxxxx] > Sent: Friday, September 09, 2016 4:58 PM > To: Amitkumar Karwar > Cc: linux-wireless@xxxxxxxxxxxxxxx; Cathy Luo; Nishant Sarmukadam > Subject: Re: mwifiex: PCIe8997 chip specific handling > > Amitkumar Karwar <akarwar@xxxxxxxxxxx> writes: > > > Hi Kalle, > > > >> -----Original Message----- > >> From: linux-wireless-owner@xxxxxxxxxxxxxxx [mailto:linux-wireless- > >> owner@xxxxxxxxxxxxxxx] On Behalf Of Kalle Valo > >> Sent: Friday, September 09, 2016 2:45 PM > >> To: Amitkumar Karwar > >> Cc: linux-wireless@xxxxxxxxxxxxxxx; Cathy Luo; Nishant Sarmukadam; > >> Amitkumar Karwar > >> Subject: Re: mwifiex: PCIe8997 chip specific handling > >> > >> Amitkumar Karwar <akarwar@xxxxxxxxxxx> wrote: > >> > The patch corrects the revision id register and uses it along with > >> > magic value and chip version registers to download appropriate > >> > firmware image. > >> > > >> > PCIe8997 Z chipset variant code has been removed, as it won't be > >> > used in production. > >> > > >> > Signed-off-by: Amitkumar Karwar <akarwar@xxxxxxxxxxx> > >> > >> Does apply, please rebase: > >> > >> Applying: mwifiex: PCIe8997 chip specific handling > >> fatal: sha1 information is lacking or useless > >> (drivers/net/wireless/marvell/mwifiex/pcie.c). > >> Repository lacks necessary blobs to fall back on 3-way merge. > >> Cannot fall back to three-way merge. > >> Patch failed at 0001 mwifiex: PCIe8997 chip specific handling > >> > > > > The patch now smoothly applies to top of the tree. It had a dependency > > with "mwifiex: add PCIe function level reset support" which is merged. > > Let me know if there is still a problem. > > Ok, I applied it now. But if there's a dependency to another patch > please document it after the "---" line, a lot easier that way. > Thanks. Sure. I will use "---" and take care of this for future patches. Regards, Amitkumar
