From: Anilkumar Kolli <akolli@codeaurora.org>
To: Kalle Valo <kvalo@codeaurora.org>
Cc: ath11k@lists.infradead.org
Subject: Re: [PATCH v2] ath11k: move per peer pktlog entry to per sta debugfs
Date: Thu, 02 May 2019 19:40:48 +0530 [thread overview]
Message-ID: <ee94731795954f316d25e25113a0f26e@codeaurora.org> (raw)
In-Reply-To: <874l6dm0n0.fsf@kamboji.qca.qualcomm.com>
>
> Applying: ath11k: move per peer pktlog entry to per sta debugfs
> Using index info to reconstruct a base tree...
> M drivers/net/wireless/ath/ath11k/debugfs_sta.c
> M drivers/net/wireless/ath/ath11k/dp_rx.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/net/wireless/ath/ath11k/dp_rx.c
> Auto-merging drivers/net/wireless/ath/ath11k/debugfs_sta.c
> CONFLICT (content): Merge conflict in
> drivers/net/wireless/ath/ath11k/debugfs_sta.c
> Recorded preimage for 'drivers/net/wireless/ath/ath11k/debugfs_sta.c'
> error: Failed to merge in the changes.
> Patch failed at 0001 ath11k: move per peer pktlog entry to per sta
> debugfs
Hi Kalle,
Could you please try in this order,
0001-ath11k-move-per-peer-pktlog-entry-to-per-sta-debugfs.patch
0001-ath11k-fix-build-issues-on-disabling-ATH11K_DEBUG.patch
Thanks
Anil.
_______________________________________________
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k
prev parent reply other threads:[~2019-05-02 14:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-24 9:49 [PATCH v2] ath11k: move per peer pktlog entry to per sta debugfs Anilkumar Kolli
2019-05-02 13:44 ` Kalle Valo
2019-05-02 14:10 ` Anilkumar Kolli [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=ee94731795954f316d25e25113a0f26e@codeaurora.org \
--to=akolli@codeaurora.org \
--cc=ath11k@lists.infradead.org \
--cc=kvalo@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