All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kalle Valo <kvalo@codeaurora.org>
To: Vasanthakumar Thiagarajan <vthiagar@codeaurora.org>
Cc: ath11k@lists.infradead.org
Subject: Re: [PATCH] ath11k/dp: Cleanup type casting in WBM link descriptor setup
Date: Mon, 24 Jun 2019 07:38:51 +0000 (UTC)	[thread overview]
Message-ID: <20190624073851.25EF660A05@smtp.codeaurora.org> (raw)
In-Reply-To: <1561089055-7355-1-git-send-email-vthiagar@codeaurora.org>

Vasanthakumar Thiagarajan <vthiagar@codeaurora.org> wrote:

> Change the type of virtual address of struct hal_wbm_idle_scatter_list
> from u32 * to struct hal_wbm_link_desc *. This also makes the pointer
> arithmetic simpler. This also fixes a bug in pointer arithmetic
> on scatter buffer address. Scatter buffer address was incremented
> by HAL_LINK_DESC_SIZE instead of sizeof(hal_wbm_link_desc).
> 
> Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@codeaurora.org>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

This had conflicts:

Applying: ath11k/dp: Cleanup type casting in WBM link descriptor setup
Using index info to reconstruct a base tree...
M       drivers/net/wireless/ath/ath11k/dp.c
M       drivers/net/wireless/ath/ath11k/hal.c
M       drivers/net/wireless/ath/ath11k/hal.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/ath/ath11k/hal.h
Auto-merging drivers/net/wireless/ath/ath11k/hal.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath11k/hal.c
Auto-merging drivers/net/wireless/ath/ath11k/dp.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath11k/dp.c
Recorded preimage for 'drivers/net/wireless/ath/ath11k/dp.c'
Recorded preimage for 'drivers/net/wireless/ath/ath11k/hal.c'
error: Failed to merge in the changes.
Patch failed at 0001 ath11k/dp: Cleanup type casting in WBM link descriptor setup

Please double check my resolution:

https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending-ath11k&id=c23d1428eb9c1bfeb1167d8770e58e55e1217170

-- 
https://patchwork.kernel.org/patch/11008423/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


_______________________________________________
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k

  reply	other threads:[~2019-06-24  7:38 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-21  3:50 [PATCH] ath11k/dp: Cleanup type casting in WBM link descriptor setup Vasanthakumar Thiagarajan
2019-06-24  7:38 ` Kalle Valo [this message]
2019-06-24  8:07   ` Vasanthakumar Thiagarajan
2019-06-24 10:57 ` Kalle Valo

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=20190624073851.25EF660A05@smtp.codeaurora.org \
    --to=kvalo@codeaurora.org \
    --cc=ath11k@lists.infradead.org \
    --cc=vthiagar@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.