On Sun, May 31, 2015 at 10:16:37AM +0900, Greg KH wrote:
> On Tue, May 26, 2015 at 02:40:57PM -0400, Don Zickus wrote:
> > From: David Kershner <david.kersh...@unisys.com>
> > 
> > Diagchannel.h is used primarily for the diagnostics channel. The
> > diagnostics channel is not being used by linux guests currently, so
> > the majority of the file is not needed. What is left is what is
> > needed to perform postcode vmcalls. Those postcodes will eventually
> > end up in the diag channel.
> > 
> > Signed-off-by: David Kershner <david.kersh...@unisys.com>
> > Signed-off-by: Benjamin Romer <benjamin.ro...@unisys.com>
> > 
> > Conflicts:
> >     drivers/staging/unisys/visorbus/visorbus_main.c
> >     drivers/staging/unisys/visorbus/visorchipset.c
> 
> What are these lines here for?

Probably popped up when I refreshed the patches. Sorry about that.

Cheers,
Don
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to