On Fri, Jun 05, 2015 at 10:45:59AM -0400, Jes Sorensen wrote: > Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx> writes: > > On Thu, Jun 04, 2015 at 09:22:45AM -0400, Benjamin Romer wrote: > >> From: David Kershner <david.kershner@xxxxxxxxxx> > >> > >> 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.kershner@xxxxxxxxxx> > >> Signed-off-by: Benjamin Romer <benjamin.romer@xxxxxxxxxx> > >> > >> Conflicts: > >> drivers/staging/unisys/visorbus/visorbus_main.c > >> drivers/staging/unisys/visorbus/visorchipset.c > >> > >> Signed-off-by: Benjamin Romer <benjamin.romer@xxxxxxxxxx> > > duplicate signature? > > The Conflicts lines and the last signed-off-by shouldn't have been there > in the first place. > > Greg do you prefer to have Ben respin this one, or are you happy to nuke > those lines? Ah, I'll just edit it, don't worry about it. thanks, greg k-h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
