RE: [PATCH 1/1] Drivers: hv: Fix a merge error

2013-10-17 Thread KY Srinivasan
> -Original Message- > From: Greg KH [mailto:gre...@linuxfoundation.org] > Sent: Thursday, October 17, 2013 11:54 AM > To: KY Srinivasan > Cc: stable@vger.kernel.org > Subject: Re: [PATCH 1/1] Drivers: hv: Fix a merge error > > On Thu, Oct 17, 2013 at 12:23:36PM

Re: [PATCH 1/1] Drivers: hv: Fix a merge error

2013-10-17 Thread Greg KH
On Thu, Oct 17, 2013 at 12:23:36PM -0700, K. Y. Srinivasan wrote: > There was merge error introduced in the commit: > b762799dd8b03ec0aafc54ba165564902eac3e18 Mon Sep 17 00:00:00 2001 How? > Fix the problem. What "problem"? totally confused. greg k-h -- To unsubscribe from this list: send the

[PATCH 1/1] Drivers: hv: Fix a merge error

2013-10-17 Thread K. Y. Srinivasan
There was merge error introduced in the commit: b762799dd8b03ec0aafc54ba165564902eac3e18 Mon Sep 17 00:00:00 2001 Fix the problem. Signed-off-by: K. Y. Srinivasan Cc: --- drivers/hv/channel_mgmt.c |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/hv/channel_mgm