On Wed, Nov 8, 2017 at 6:17 AM, Steffen Maier <maier@xxxxxxxxxxxxxxxxxx> wrote: > Hi all, > > here is a small series for the timer_setup() refactoring of zfcp. > We target it for the merge window to land in v4.15-rc1. > > Unfortunately, they don't seem to apply to the current state of neither > James' misc branch nor Martin's 4.15/scsi-queue branch, > because they depend on: > v4.14-rc3 686fef928bba ("timer: Prepare to change timer callback argument type") > and > v4.14-rc7 ab31fd0ce65e ("scsi: zfcp: fix erp_action use-before-initialize in REC action trace"). > > However, they do apply to Linus' tree for v4.14-rc7 or later and > thus they would also apply for the upcoming merge window. > > In http://www.spinics.net/lists/linux-scsi/msg114581.html I saw a decision > to have such changes go in via the timer tree. I would be happy with that. > > Kees Cook (1): > zfcp: convert timers to use timer_setup() > > Steffen Maier (2): > zfcp: purely mechanical update using timer API, plus blank lines > zfcp: drop open coded assignments of timer_list.function These looks great, thanks! -Kees > > drivers/s390/scsi/zfcp_erp.c | 15 +++++++++------ > drivers/s390/scsi/zfcp_ext.h | 2 +- > drivers/s390/scsi/zfcp_fsf.c | 13 ++++++------- > 3 files changed, 16 insertions(+), 14 deletions(-) > > -- > 2.13.5 > -- Kees Cook Pixel Security