Hi Kalle,

> From: linux-wireless-ow...@vger.kernel.org [mailto:linux-wireless-
> ow...@vger.kernel.org] On Behalf Of Kalle Valo
> Sent: Saturday, September 03, 2016 9:10 PM
> To: Amitkumar Karwar
> Cc: linux-wireless@vger.kernel.org; Amitkumar Karwar
> Subject: Re: mwifiex: add PCIe function level reset support
> 
> Amitkumar Karwar <akar...@marvell.com> wrote:
> > This patch implements pre and post FLR handlers to support PCIe FLR
> > functionality. Software cleanup is performed in pre-FLR whereas
> > firmware is downloaded and software is re-initialised in post-FLR
> > handler.
> >
> > Following command triggers FLR.
> > echo "1" > /sys/bus/pci/devices/$NUMBER/reset
> >
> > This feature can be used as a recovery mechanism when firmware gets
> > hang.
> >
> > Signed-off-by: Amitkumar Karwar <akar...@marvell.com>
> 
> 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.

Regards,
Amitkumar

Reply via email to