From: Kalle Valo <kvalo@codeaurora.org>
To: Muna Sinada <msinada@codeaurora.org>
Cc: ath11k@lists.infradead.org
Subject: Re: [PATCH 2/4] ath11k: changed parameter from u8 * to struct sk_buff *
Date: Wed, 26 Jun 2019 11:12:53 +0300 [thread overview]
Message-ID: <87pnn0ojcq.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <1561487614-24577-2-git-send-email-msinada@codeaurora.org> (Muna Sinada's message of "Tue, 25 Jun 2019 11:33:32 -0700")
Muna Sinada <msinada@codeaurora.org> writes:
> Changed ath11k_hal_rx_parse_mon_status() to take sk_buff pointer instead of
> opaque u8 pointer. Removed variables that became unused.
>
> Signed-off-by: Muna Sinada <msinada@codeaurora.org>
Doesn't apply and sha1 is invalid so I can't use 3-way merge. Please
ALWAYS use ath11k-bringup branch as the baseline and don't have any
extra patches applied.
Applying: ath11k: removed duplicated functionality
Applying: ath11k: changed parameter from u8 * to struct sk_buff *
fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath11k/dp_rx.c).
error: could not build fake ancestor
Patch failed at 0002 ath11k: changed parameter from u8 * to struct sk_buff *
--
Kalle Valo
_______________________________________________
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k
next prev parent reply other threads:[~2019-06-26 8:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-25 18:33 [PATCH 1/4] ath11k: removed duplicated functionality Muna Sinada
2019-06-25 18:33 ` [PATCH 2/4] ath11k: changed parameter from u8 * to struct sk_buff * Muna Sinada
2019-06-26 8:12 ` Kalle Valo [this message]
2019-06-25 18:33 ` [PATCH 3/4] ath11k: comments added to explain purpose Muna Sinada
2019-06-25 18:33 ` [PATCH 4/4] ath11k: added RMB to return_buffer_manager description Muna Sinada
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=87pnn0ojcq.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@codeaurora.org \
--cc=ath11k@lists.infradead.org \
--cc=msinada@codeaurora.org \
/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