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>

diff --cc drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
Simple merge

diff --cc drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
Simple merge