From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hfJYy-0007Sj-HE for ath11k@lists.infradead.org; Mon, 24 Jun 2019 07:38:54 +0000 MIME-Version: 1.0 Subject: Re: [PATCH] ath11k/dp: Cleanup type casting in WBM link descriptor setup From: Kalle Valo In-Reply-To: <1561089055-7355-1-git-send-email-vthiagar@codeaurora.org> References: <1561089055-7355-1-git-send-email-vthiagar@codeaurora.org> Message-Id: <20190624073851.25EF660A05@smtp.codeaurora.org> Date: Mon, 24 Jun 2019 07:38:51 +0000 (UTC) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ath11k" Errors-To: ath11k-bounces+kvalo=adurom.com@lists.infradead.org To: Vasanthakumar Thiagarajan Cc: ath11k@lists.infradead.org Vasanthakumar Thiagarajan 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 > Signed-off-by: Kalle Valo 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