[PATCH v5 09/13] staging: unisys: Remove unneeded fields in diagchannel.h

[Jes Sorensen]

Sudip Mukherjee <sudipm.mukherjee at gmail.com> writes:
> On Thu, Jun 04, 2015 at 09:22:45AM -0400, Benjamin Romer wrote:
>> From: David Kershner <david.kershner at 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.kershner at unisys.com>
>> Signed-off-by: Benjamin Romer <benjamin.romer at unisys.com>
>> 
>> Conflicts:
>> 	drivers/staging/unisys/visorbus/visorbus_main.c
>> 	drivers/staging/unisys/visorbus/visorchipset.c
>> 
>> Signed-off-by: Benjamin Romer <benjamin.romer at unisys.com>
> 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?

Cheers,
Jes