]> asedeno.scripts.mit.edu Git - linux.git/commit
projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7a3888a e416a89)
Merge lustre patches based on 4.0-rc5 into staging-testing
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 3 Apr 2015 10:56:05 +0000 (12:56 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 3 Apr 2015 10:56:21 +0000 (12:56 +0200)
commit7928848997a708dcdf21e2d2f0875fe6764c5870
tree1c88c6d915fbade207fc0fbfda41af11ca5f758ctree | snapshot
parent7a3888a3ad15796c834dc6cb00d247d27021f01bcommit | diff
parente416a893210a4b4f17bb7e6670f8cd218080a3d5commit | diff
Merge lustre patches based on 4.0-rc5 into staging-testing

This is done to handle some lustre patches that were made against the
wrong kernel branch, which was my fault, as I gave a lecture where I
messed things up for the students, it wasn't their fault.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c diff1 | diff2 | blob | history
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c diff1 | diff2 | blob | history
local clone of linux.git