From: Kalle Valo <kvalo@codeaurora.org>
To: linux-wireless@vger.kernel.org
Cc: Igor Mitsyanko <igor.mitsyanko.os@quantenna.com>,
Avinash Patil <avinashp@quantenna.com>,
Vasily Ulyanov <vulyanov@quantenna.com>
Subject: Re: [1/5] qtnfmac: modify full Tx queue error reporting
Date: Mon, 30 Oct 2017 12:31:29 +0200 [thread overview]
Message-ID: <87k1zd2agu.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <20171030094459.kj6nnrrc52wj2bsp@bars> (Sergey Matyukevich's message of "Mon, 30 Oct 2017 12:45:00 +0300")
Sergey Matyukevich <sergey.matyukevich.os@quantenna.com> writes:
>> > My assumption is that by default all the patches should cleanly apply
>> > to wireless-drivers-next. I could apply the patch in question to
>> > wireless-drivers-next without any issues.
>>
>> Odd. How did you apply it? My script uses 'git am -s -3' individually
>> for each patch in the series, but to my knowledge that shouldn't cause
>> any problems.
>
> It turns out I mechanically rebased my branch on top of w-d-n before writing
> the previous email. Now I could reproduce the same failure when using this
> command for the original patches downloaded from patchwork.
Ok, that makes sense. Most likely when git-rebase does a 3-way merge
automatically and that's why you were able to successfully apply them.
But as git-am was not able to use 3-way merge due to incorrect sha1
information it failed.
> The problem was in conflict with qtnfmac fixes pulled to w-d-n from
> w-d.
Ok, thanks for investigating the root cause.
--
Kalle Valo
next prev parent reply other threads:[~2017-10-30 10:31 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-15 20:53 [PATCH 0/8] qtnfmac: misc small features and fixes Sergey Matyukevich
2017-10-15 20:53 ` [PATCH 1/5] qtnfmac: modify full Tx queue error reporting Sergey Matyukevich
2017-10-27 8:48 ` [1/5] " Kalle Valo
2017-10-29 15:32 ` Sergey Matyukevich
2017-10-30 8:02 ` Kalle Valo
2017-10-30 9:45 ` Sergey Matyukevich
2017-10-30 10:31 ` Kalle Valo [this message]
2017-10-15 20:53 ` [PATCH 2/5] qtnfmac: enable registration of more mgmt frames Sergey Matyukevich
2017-10-15 20:53 ` [PATCH 3/5] qtnfmac: drop nonexistent function declaration Sergey Matyukevich
2017-10-15 20:53 ` [PATCH 4/5] qtnfmac: modify full Tx queue recovery Sergey Matyukevich
2017-10-15 20:53 ` [PATCH 5/5] qtnfmac: advertise support of inactivity timeout Sergey Matyukevich
2017-10-16 19:22 ` [PATCH 0/8] qtnfmac: misc small features and fixes Igor Mitsyanko
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=87k1zd2agu.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@codeaurora.org \
--cc=avinashp@quantenna.com \
--cc=igor.mitsyanko.os@quantenna.com \
--cc=linux-wireless@vger.kernel.org \
--cc=vulyanov@quantenna.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).