| commit | 1d8241bbd53cc5113d3221ed40a7b5ae14e43b55 | [log] [tgz] |
|---|---|---|
| author | Al Viro <viro@zeniv.linux.org.uk> | Thu Mar 02 04:52:30 2017 -0500 |
| committer | Al Viro <viro@zeniv.linux.org.uk> | Thu Mar 02 05:38:36 2017 -0500 |
| tree | 6217a3fb564c40494a4673630486b002d555e9b9 | |
| parent | 4038a2a37e3595c299aecdaa20cb01ceb9c78303 [diff] | |
| parent | 4977ab6e92e267afe9d8f78438c3db330ca8434c [diff] |
Conflict resolution with mainline drivers/block/nbd.c - resolved as in -next