projects / linux-2.6-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 297fae4 e7bdea7)
Merge commit 'e7bdea7750eb'
authorTrond Myklebust <trond.myklebust@primarydata.com>
Sun, 24 Jul 2016 16:51:10 +0000 (12:51 -0400)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Sun, 24 Jul 2016 16:51:10 +0000 (12:51 -0400)
Needed in order to work on top of pNFS changes in Linus' upstream kernel.


Trivial merge
Linux 6.x block layer and io_uring tree(s)