f341dddf1d
There were a number of patches that went into Linus's tree already that conflicted with other changes in the staging branch. This merge resolves those merge conflicts. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
||
|---|---|---|
| .. | ||
| blkvsc_drv.c | ||
| BlkVsc.c | ||
| Channel.c | ||
| Channel.h | ||
| ChannelInterface.c | ||
| ChannelInterface.h | ||
| ChannelMgmt.c | ||
| ChannelMgmt.h | ||
| Connection.c | ||
| hv_api.h | ||
| Hv.c | ||
| Hv.h | ||
| Kconfig | ||
| logging.h | ||
| Makefile | ||
| netvsc_drv.c | ||
| NetVsc.c | ||
| NetVsc.h | ||
| NetVscApi.h | ||
| osd.c | ||
| osd.h | ||
| RingBuffer.c | ||
| RingBuffer.h | ||
| rndis.h | ||
| RndisFilter.c | ||
| RndisFilter.h | ||
| storvsc_drv.c | ||
| StorVsc.c | ||
| StorVscApi.h | ||
| TODO | ||
| VersionInfo.h | ||
| vmbus_drv.c | ||
| Vmbus.c | ||
| vmbus.h | ||
| VmbusApi.h | ||
| VmbusChannelInterface.h | ||
| VmbusPacketFormat.h | ||
| VmbusPrivate.h | ||
| vstorage.h | ||