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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 5 Nov 2014 15:37:04 +1100

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                    [email-masked]

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.