ACK/cmnt: [SRU][Z][PATCH 1/1] nvme: update timeout module parameter type

[Daniel Axtens]

Hi Stefan,

I did consider that, but I found that although the cherry-pick succeeds in
both cases, the patch generated for Zesty wouldn't apply to Artful and vice
versa as the context had changed. Is that something the kernel team is
happy to sort out yourselves, or do you still want 2 patches in this case?

Regards,
Daniel

On Sat, Nov 18, 2017 at 1:01 AM, Stefan Bader <stefan.bader at canonical.com>
wrote:

> On 16.11.2017 06:36, Daniel Axtens wrote:
> > From: Marc Olson <marcolso at amazon.com>
> >
> > BugLink: https://bugs.launchpad.net/bugs/1729119
> >
> > The underlying blk_mq_tag_set, and request timeout parameters support an
> > unsigned int. Extend the size of the nvme module parameters for io and
> > admin commands to match.
> >
> > Signed-off-by: Marc Olson <marcolso at amazon.com>
> > Signed-off-by: Christoph Hellwig <hch at lst.de>
> > (cherry picked from commit 8ae4e4477d8f5cc7736816a0492f82934ca32ab7
> linux-next)
> > Signed-off-by: Daniel Axtens <daniel.axtens at canonical.com>
> Acked-by: Stefan Bader <stefan.bader at canonical.com>
>
> > ---
>
> As the Zesty and Artful change should be identical (both claim to be
> cherry-picks, I would prefer to see it submitted only once ([SRU Z/A]). So
> it
> needs only one pass of looking at and acking.
>
> Thanks,
> Stefan
>
> >  drivers/nvme/host/core.c | 8 ++++----
> >  drivers/nvme/host/nvme.h | 4 ++--
> >  2 files changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
> > index c50e8cf92c8b..4b2b77f64033 100644
> > --- a/drivers/nvme/host/core.c
> > +++ b/drivers/nvme/host/core.c
> > @@ -35,13 +35,13 @@
> >
> >  #define NVME_MINORS          (1U << MINORBITS)
> >
> > -unsigned char admin_timeout = 60;
> > -module_param(admin_timeout, byte, 0644);
> > +unsigned int admin_timeout = 60;
> > +module_param(admin_timeout, uint, 0644);
> >  MODULE_PARM_DESC(admin_timeout, "timeout in seconds for admin
> commands");
> >  EXPORT_SYMBOL_GPL(admin_timeout);
> >
> > -unsigned char nvme_io_timeout = 30;
> > -module_param_named(io_timeout, nvme_io_timeout, byte, 0644);
> > +unsigned int nvme_io_timeout = 30;
> > +module_param_named(io_timeout, nvme_io_timeout, uint, 0644);
> >  MODULE_PARM_DESC(io_timeout, "timeout in seconds for I/O");
> >  EXPORT_SYMBOL_GPL(nvme_io_timeout);
> >
> > diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
> > index 7596ae072b5c..e3b3bb638fa3 100644
> > --- a/drivers/nvme/host/nvme.h
> > +++ b/drivers/nvme/host/nvme.h
> > @@ -30,10 +30,10 @@ enum {
> >       NVME_SC_CANCELLED               = -EINTR,
> >  };
> >
> > -extern unsigned char nvme_io_timeout;
> > +extern unsigned int nvme_io_timeout;
> >  #define NVME_IO_TIMEOUT      (nvme_io_timeout * HZ)
> >
> > -extern unsigned char admin_timeout;
> > +extern unsigned int admin_timeout;
> >  #define ADMIN_TIMEOUT        (admin_timeout * HZ)
> >
> >  extern unsigned char shutdown_timeout;
> >
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20171118/749c2aae/attachment.html>