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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20141106155450.002a6b2b@canb.auug.org.au>
Date:	Thu, 6 Nov 2014 15:54:50 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Arnd Bergmann <arnd@...db.de>,
	Mauro Carvalho Chehab <mchehab@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Tapasweni Pathak <tapaswenipathak@...il.com>,
	Amber Thrall <amber.rose.thrall@...il.com>
Subject: linux-next: manual merge of the y2038 tree with the v4l-dvb tree

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                    sfr@...b.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,

Content of type "application/pgp-signature" skipped