Re: [PATCH 1/1] Stage: hv: Rename struct device_context andre-arrange the fields inside (re-formatted)

[Greg KH]

On Wed, Feb 17, 2010 at 08:58:47PM +0000, Haiyang Zhang wrote:
> From: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
> 
> Rename struct device_context and re-arrange the fields inside.
> Rename struct device_context to struct vm_device, and move 
> struct device field to the end according to Document/driver-model standard.
> 
> Cc: Greg Kroah-Hartman <gregkh@xxxxxxx>
> Signed-off-by: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
> Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>

What tree did you make this against?  I'm getting conflicts in the
drivers/staging/hv/storvsc_drv.c file.  Let me go see if they are
trivial for me to fix up or not...

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/