On Fri, Oct 27, 2017 at 11:18 AM, Kalle Valo <kvalo@xxxxxxxxxxxxxxxx> wrote: > Kees Cook <keescook@xxxxxxxxxxxx> 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 <kvalo@xxxxxxxxxxxxxxxx> >> Cc: linux-wireless@xxxxxxxxxxxxxxx >> Cc: netdev@xxxxxxxxxxxxxxx >> Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx> >> Signed-off-by: Kalle Valo <kvalo@xxxxxxxxxxxxxxxx> > > 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 This looks correct to me, thanks for merging! -Kees -- Kees Cook Pixel Security
