From: John L. Hammond Date: Thu, 11 Jun 2015 19:18:10 +0000 (-0400) Subject: staging:lustre: merge socklnd_lib-linux.h into socklnd.h X-Git-Tag: omap-for-v4.3/legacy-v2-signed~121^2~229 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12c41f001015eb00fff6c677a2d83332cfd2c8b9;p=pandora-kernel.git staging:lustre: merge socklnd_lib-linux.h into socklnd.h Originally socklnd_lib-linux.h contained linux specific wrappers and defines but since the linux kernel is the only supported platform now we can merge what little remains in the header into socklnd.h. This is broken out of the original patch 12932 that was merged to the Intel/OpenSFS branch. Signed-off-by: John L. Hammond Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2675 Reviewed-on: http://review.whamcloud.com/12932 Reviewed-by: Isaac Huang Reviewed-by: James Simmons Reviewed-by: Oleg Drokin Signed-off-by: James Simmons Signed-off-by: Greg Kroah-Hartman --- Reading git-diff-tree failed