Subject: linux-next: manual merge of the staging tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 8 Apr 2011 15:57:52 +1000

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/hv/hv_util.c between commit 25985edcedea ("Fix common
misspellings") from Linus' tree and commit af7a5b6e598c ("staging: hv:
Replaced DPRINT and printk with native functions in hv_utils") from the
staging tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/staging/hv/hv_util.c
index 2df1568,3af0a11..0000000
--- a/drivers/staging/hv/hv_util.c
+++ b/drivers/staging/hv/hv_util.c
@@@ -79,8 -78,8 +78,8 @@@ static void shutdown_onchannelcallback(
  				icmsghdrp->status = HV_S_OK;
  				execute_shutdown = true;
  
- 				DPRINT_INFO(VMBUS, "Shutdown request received -"
- 					    " graceful shutdown initiated");
+ 				pr_info("Shutdown request received -"
 -					    " gracefull shutdown initiated\n");
++					    " graceful shutdown initiated\n");
  				break;
  			default:
  				icmsghdrp->status = HV_E_FAIL;