linux-next: manual merge of the y2038 tree with the v4l-dvb tree

[Stephen Rothwell]

Hi Arnd,

Today's linux-next merge of the y2038 tree got a conflict in
drivers/staging/media/lirc/lirc_sasem.c between commit f3a75505ab5f
("[media] Staging: media: lirc: cleaned up packet dump in 2 files")
from the v4l-dvb tree and commit db77d73bffbc ("staging: media: lirc:
Replace timeval with ktime_t in lirc_sasem.c") from the y2038 tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc drivers/staging/media/lirc/lirc_sasem.c
index 196f2a7f5bb3,dfd5668656e2..000000000000
--- a/drivers/staging/media/lirc/lirc_sasem.c
+++ b/drivers/staging/media/lirc/lirc_sasem.c
@@@ -571,8 -572,9 +572,8 @@@ static void incoming_packet(struct sase
  {
        int len = urb->actual_length;
        unsigned char *buf = urb->transfer_buffer;
-       long ms;
-       struct timeval tv;
+       u64 ns;
+       ktime_t kt;
 -      int i;
  
        if (len != 8) {
                dev_warn(&context->dev->dev,

pgpbthRsFa9xY.pgp
Description: OpenPGP digital signature