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: Tue, 21 Mar 2017 08:59:18 -0700 [thread overview]
Message-ID: <20170321155916.GA95754@google.com> (raw)
In-Reply-To: <874lym7roy.fsf@kamboji.qca.qualcomm.com>
On Tue, Mar 21, 2017 at 02:14:05PM +0200, Kalle Valo wrote:
> Brian Norris <briannorris@chromium.org> writes:
> > On Mon, Mar 20, 2017 at 05:08:35PM +0000, Kalle Valo wrote:
> >> 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
> >>
> >> Patch set to Changes Requested.
> >
> > This applies fine to your wireless-drivers/master branch for me, where
> > patches 1-3 were applied. Are you applying this to
> > wireless-drivers-next? It's quite understandable that patch 4 wouldn't
> > apply there, as you've stripped out the previous patches...
>
> I (wrongly) understood that patches 1-3 are for 4.11 and patch 4 is for
> 4.12, don't remember anymore how I got that impression. But I don't
Well, you're not exactly wrong. I mentioned in the cover letter that the
first 3 are bugfixes (probably for 4.11) and the 4th is not.
> think a cleanup patch like this is justified for 4.11 so I'm not
> comfortable applying this to wireless-drivers (which should only contain
> fixes to important bugs or regressions).
Right.
> What I could do is to wait for the patches 1-3 trickle down to w-d-next
> and then apply this patch. It usually takes few weeks, but with bad luck
> it might happen only after the merge window. Would that work?
Yeah, I figured something like that would happen. Seems fine to me.
Brian
next prev parent reply other threads:[~2017-03-21 15:59 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 [this message]
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
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=20170321155916.GA95754@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).