Kees Cook <keesc...@chromium.org> wrote:

> In preparation for unconditionally passing the struct timer_list pointer to
> all timer callbacks, switch to using the new timer_setup() and from_timer()
> to pass the timer pointer explicitly.
> 
> Cc: Kalle Valo <kv...@qca.qualcomm.com>
> Cc: linux-wireless@vger.kernel.org
> Cc: net...@vger.kernel.org
> Signed-off-by: Kees Cook <keesc...@chromium.org>
> Signed-off-by: Kalle Valo <kv...@qca.qualcomm.com>

There were some conflicts but luckily 3-way merge was able to automatically
solve them. But please do check the patch from my pending branch:

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

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

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

Reply via email to