| commit | 4b1db6de0be011b3ed1548e290df898ed7aa5493 | [log] [tgz] |
|---|---|---|
| author | Mike Snitzer <snitzer@redhat.com> | Thu Jul 21 10:42:24 2016 -0400 |
| committer | Mike Snitzer <snitzer@redhat.com> | Thu Jul 21 10:42:24 2016 -0400 |
| tree | a9814d91b0ff46b9c14575fc4b001e6d8ec6d2f5 | |
| parent | b5ab4a9ba5574430870391e93b125ada31217c4c [diff] | |
| parent | 13880f5b57adf34d050cf7e229a6326da45a7347 [diff] |
Merge remote-tracking branch 'jens/for-4.8/drivers' into dm-4.8-block-drivers-merge Resolve conflicts from REQ_RAHEAD and QUEUE_FLAG_SECERASE changes.