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

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/media/lirc/lirc_imon.c between commit f3a75505ab5f
("[media] Staging: media: lirc: cleaned up packet dump in 2 files")
from the v4l-dvb tree and commit 732ba199ab07 ("staging: media: lirc:
lirc_imon.c: replace printk by dev_dbg") from the staging tree.

I fixed it up (the staging tree patch was not complete, so I did the
below) and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/staging/media/lirc/lirc_imon.c
index 232edd5b1742,f98418cd2305..000000000000
--- a/drivers/staging/media/lirc/lirc_imon.c
+++ b/drivers/staging/media/lirc/lirc_imon.c
@@@ -619,8 -597,13 +596,9 @@@ static void imon_incoming_packet(struc
  		return;
  	}
  
 -	if (debug) {
 -		dev_info(dev, "raw packet: ");
 -		for (i = 0; i < len; ++i)
 -			dev_dbg(dev, "%02x ", buf[i]);
 -		dev_dbg(dev, "\n");
 -	}
 +	if (debug)
- 		dev_info(dev, "raw packet: %*ph\n", len, buf);
++		dev_dbg(dev, "raw packet: %*ph\n", len, buf);
+ 
  	/*
  	 * Translate received data to pulse and space lengths.
  	 * Received data is active low, i.e. pulses are 0 and

Attachment: pgpCJiZtt7Erf.pgp
Description: OpenPGP digital signature