All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kalle Valo <kvalo@codeaurora.org>
To: Amitkumar Karwar <akarwar@marvell.com>
Cc: "linux-wireless\@vger.kernel.org"
	<linux-wireless@vger.kernel.org>, "Cathy Luo" <cluo@marvell.com>,
	Nishant Sarmukadam <nishants@marvell.com>,
	"rajatja\@google.com" <rajatja@google.com>,
	"briannorris\@google.com" <briannorris@google.com>,
	"dmitry.torokhov\@gmail.com" <dmitry.torokhov@gmail.com>,
	Xinming Hu <huxm@marvell.com>
Subject: Re: [1/2] mwifiex: code rearrangement in pcie.c and sdio.c
Date: Fri, 30 Dec 2016 13:28:16 +0200	[thread overview]
Message-ID: <87mvfdk65r.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <25e936b31e1e4f3d9db2c2309da9f798@SC-EXCH04.marvell.com> (Amitkumar Karwar's message of "Wed, 7 Dec 2016 10:52:15 +0000")

Amitkumar Karwar <akarwar@marvell.com> writes:

> Hi Kalle,
>
>> Failed to apply:
>> 
>> fatal: sha1 information is lacking or useless
>> (drivers/net/wireless/marvell/mwifiex/pcie.c).
>> Applying: mwifiex: get rid of global user_rmmod flag Repository lacks
>> necessary blobs to fall back on 3-way merge.
>> Cannot fall back to three-way merge.
>> Patch failed at 0001 mwifiex: get rid of global user_rmmod flag
>> 
>> 2 patches set to Changes Requested.
>> 
>> 9454491 [1/2] mwifiex: code rearrangement in pcie.c and sdio.c
>> 9454493 [2/2] mwifiex: get rid of global user_rmmod flag
>> 
>> --
>> https://patchwork.kernel.org/patch/9454491/
>> 
>> Documentation about submitting wireless patches and checking status
>> from patchwork:
>> 
>> https://wireless.wiki.kernel.org/en/developers/documentation/submitting
>> patches
>
>
> These two patches have dependency with other patch series. I want you to consider patches in following order(first being recent).
>
> mwifiex: sdio: fix use after free issue for save_adapter

This applied fine.

> mwifiex: use module_*_driver helper macros
>
> [2/2] mwifiex: get rid of global user_rmmod flag
> [1/2] mwifiex: code rearrangement in pcie.c and sdio.c
>
> [v3,5/5] mwifiex: move pcie_work and related variables inside card -------- This series can be accepted if there are no further concerns/comments from Brian/Dmitry. 
> [v3,4/5] mwifiex: wait firmware dump complete during card remove process
> [v3,3/5] mwifiex: get rid of drv_info* adapter variables
> [v3,2/5] mwifiex: do not free firmware dump memory in shutdown_drv
> [v3,1/5] mwifiex: don't wait for main_process in shutdown_drv

But these didn't. Can you please rebase these and resubmit in one
patchset? Less conflicts that way.

-- 
Kalle Valo

  reply	other threads:[~2016-12-30 11:28 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-30 14:52 [PATCH 1/2] mwifiex: code rearrangement in pcie.c and sdio.c Amitkumar Karwar
2016-11-30 14:52 ` [PATCH 2/2] mwifiex: get rid of global user_rmmod flag Amitkumar Karwar
2016-11-30 18:38   ` Dmitry Torokhov
2016-12-01 13:11     ` Amitkumar Karwar
2016-12-05 11:09 ` [1/2] mwifiex: code rearrangement in pcie.c and sdio.c Kalle Valo
2016-12-07 10:52   ` Amitkumar Karwar
2016-12-30 11:28     ` Kalle Valo [this message]
2017-01-11 15:47       ` Amitkumar Karwar
2017-01-12 14:55         ` Kalle Valo
2017-01-17  8:34           ` Amitkumar Karwar
2017-01-17 11:10             ` Kalle Valo
2016-12-30 11:24 ` Kalle Valo
2017-01-12 14:46 ` Kalle Valo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87mvfdk65r.fsf@kamboji.qca.qualcomm.com \
    --to=kvalo@codeaurora.org \
    --cc=akarwar@marvell.com \
    --cc=briannorris@google.com \
    --cc=cluo@marvell.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=huxm@marvell.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=nishants@marvell.com \
    --cc=rajatja@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.