From: Brian Norris <briannorris@chromium.org>
To: Kalle Valo <kvalo@codeaurora.org>
Cc: Amitkumar Karwar <akarwar@marvell.com>,
Nishant Sarmukadam <nishants@marvell.com>,
linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org,
Rajat Jain <rajatja@google.com>
Subject: Re: [4/4] mwifiex: pcie: de-duplicate buffer allocation code
Date: Thu, 18 May 2017 09:30:08 -0700 [thread overview]
Message-ID: <20170518163007.GA117009@google.com> (raw)
In-Reply-To: <20170518133348.6C5C660F63@smtp.codeaurora.org>
On Thu, May 18, 2017 at 01:33:48PM +0000, Kalle Valo wrote:
> Brian Norris <briannorris@chromium.org> wrote:
> > This code was duplicated as part of the PCIe FLR code added to this
> > driver. Let's de-duplicate it to:
> >
> > * make things easier to read (mwifiex_pcie_free_buffers() now has a
> > corresponding mwifiex_pcie_alloc_buffers())
> > * reduce likelihood of bugs
> > * make error logging equally verbose
> > * save lines of code!
> >
> > Also drop some of the commentary that isn't really needed.
> >
> > Signed-off-by: Brian Norris <briannorris@chromium.org>
>
> Failed to apply:
>
> fatal: sha1 information is lacking or useless (drivers/net/wireless/marvell/mwifiex/pcie.c).
> error: could not build fake ancestor
> Applying: mwifiex: pcie: de-duplicate buffer allocation code
> Patch failed at 0001 mwifiex: pcie: de-duplicate buffer allocation code
> The copy of the patch that failed is found in: .git/rebase-apply/patch
Hmm, well it still applies for me, but it does require a 3-way merge...
and I guess I have local history (because the 3 previous patches *used*
to be together...):
$ pwclient git-am -p linux-wireless 9618309
Applying patch #9618309 using u'git am'
Description: [4/4] mwifiex: pcie: de-duplicate buffer allocation code
Applying: mwifiex: pcie: de-duplicate buffer allocation code
Using index info to reconstruct a base tree...
M drivers/net/wireless/marvell/mwifiex/pcie.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/marvell/mwifiex/pcie.c
Anyway, I'll resend.
Brian
> Patch set to Changes Requested.
> https://patchwork.kernel.org/patch/9618309/
>
> https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
>
prev parent reply other threads:[~2017-05-18 16:30 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-11 1:39 [PATCH 0/4] mwifiex: several bugfixes Brian Norris
2017-03-11 1:39 ` [PATCH 1/4] mwifiex: pcie: don't leak DMA buffers when removing Brian Norris
2017-03-16 8:14 ` [1/4] " Kalle Valo
2017-03-11 1:39 ` [PATCH 2/4] mwifiex: set adapter->dev before starting to use mwifiex_dbg() Brian Norris
2017-03-11 1:39 ` [PATCH 3/4] mwifiex: uninit wakeup info when removing device Brian Norris
2017-03-11 1:39 ` [PATCH 4/4] mwifiex: pcie: de-duplicate buffer allocation code Brian Norris
2017-03-20 17:08 ` [4/4] " Kalle Valo
[not found] ` <20170320170835.5ED1C609C6@smtp.codeaurora.org>
2017-03-20 20:05 ` Brian Norris
2017-03-21 12:14 ` Kalle Valo
2017-03-21 15:59 ` Brian Norris
2017-04-28 16:50 ` Brian Norris
2017-05-04 13:11 ` Kalle Valo
2017-05-18 13:33 ` Kalle Valo
[not found] ` <20170518133348.6C5C660F63@smtp.codeaurora.org>
2017-05-18 16:30 ` Brian Norris [this message]
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=20170518163007.GA117009@google.com \
--to=briannorris@chromium.org \
--cc=akarwar@marvell.com \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).