linux-kernel - linux-next: manual merge of the staging 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: <20141105153704.3af595f9@canb.auug.org.au>
Date:	Wed, 5 Nov 2014 15:37:04 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>,
	Mauro Carvalho Chehab <mchehab@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Amber Thrall <amber.rose.thrall@...il.com>,
	Aybuke Ozdemir <aybuke.147@...il.com>
Subject: linux-next: manual merge of the staging tree with the v4l-dvb tree

Hi Greg,

Today's linux-next merge of the staging 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 eca6a8872a04 ("staging: media: lirc:
Use pr_* instead of printk") from the staging tree.

I fixed it up (I just used the v4l-dvb tree version - 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 2f0463eb9887,123ddf68b587..000000000000
--- a/drivers/staging/media/lirc/lirc_sasem.c
+++ b/drivers/staging/media/lirc/lirc_sasem.c
@@@ -581,8 -582,13 +581,9 @@@ static void incoming_packet(struct sase
  		return;
  	}
  
 -	if (debug) {
 -		pr_info("Incoming data: ");
 -		for (i = 0; i < 8; ++i)
 -			pr_cont("%02x ", buf[i]);
 -		pr_cont("\n");
 -	}
 +	if (debug)
 +		dev_info(&context->dev->dev, "Incoming data: %*ph\n", len, buf);
+ 
  	/*
  	 * Lirc could deal with the repeat code, but we really need to block it
  	 * if it arrives too late.  Otherwise we could repeat the wrong code.

Content of type "application/pgp-signature" skipped