Merge tag 'hsi-for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

Pull HSI update from Sebastian Reichel:
 "Y2038 fix for cmt-speech"

* tag 'hsi-for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
  HSI: cmt_speech: use timespec64 instead of timespec

diff --combined drivers/hsi/clients/cmt_speech.c
index e6ad3de6c975309914e7e3dd8351ca667cd885ae,05b80723d39dd831d8796231fb29db605c33b033..8fbbacb0fe21ec5937ad8a123b1aefb6f5ee44a6
--- 1/drivers/hsi/clients/cmt_speech.c
--- 2/drivers/hsi/clients/cmt_speech.c
+++ b/drivers/hsi/clients/cmt_speech.c
@@@ -451,11 -451,11 +451,11 @@@ static void cs_hsi_read_on_control_comp
        dev_dbg(&hi->cl->device, "Read on control: %08X\n", cmd);
        cs_release_cmd(msg);
        if (hi->flags & CS_FEAT_TSTAMP_RX_CTRL) {
-               struct timespec tspec;
+               struct timespec64 tspec;
                struct cs_timestamp *tstamp =
                        &hi->mmap_cfg->tstamp_rx_ctrl;
  
-               ktime_get_ts(&tspec);
+               ktime_get_ts64(&tspec);
  
                tstamp->tv_sec = (__u32) tspec.tv_sec;
                tstamp->tv_nsec = (__u32) tspec.tv_nsec;
@@@ -1124,10 -1124,10 +1124,10 @@@ static int cs_char_fasync(int fd, struc
        return 0;
  }
  
 -static unsigned int cs_char_poll(struct file *file, poll_table *wait)
 +static __poll_t cs_char_poll(struct file *file, poll_table *wait)
  {
        struct cs_char *csdata = file->private_data;
 -      unsigned int ret = 0;
 +      __poll_t ret = 0;
  
        poll_wait(file, &cs_char_data.wait, wait);
        spin_lock_bh(&csdata->lock);