Merge branch 'stable/for-jens-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-4.1/drivers

Browse source

Konrad writes:

This pull has one fix and an cleanup.

Note that David Vrabel in the xen/tip.git tree has other changes for the
Xen block drivers that are related to his grant work - and they do not
conflict with this git pull.

...

This commit is contained in:

Jens Axboe 2015-04-07 20:00:45 -06:00

parent a67a95134f 77387b82d1

commit 976f2ab498

3 changed files with 54 additions and 52 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

62

drivers/block/xen-blkback/blkback.c

View file

6

drivers/block/xen-blkback/common.h

View file

38

drivers/block/xen-blkback/xenbus.c

View file