]> git.karo-electronics.de Git - karo-tx-linux.git/commit
staging: lustre: remove lustre/include/linux/
authorJohn L. Hammond <john.hammond@intel.com>
Sun, 18 Sep 2016 20:38:41 +0000 (16:38 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 19 Sep 2016 08:03:41 +0000 (10:03 +0200)
commit23ec6607e98bf78a864c5d3393aa07f4ece3ff3a
tree3ac4eae79aeac9ef289d460784ef19696a5ecf2f
parentc658b69656bb3081e1cd4ba93d2f2d8626903716
staging: lustre: remove lustre/include/linux/

Merge the contents of lustre/include/linux/lvfs.h into
lustre/include/lvfs.h. Merge lustre/include/linux/lustre_user.h into
lustre/include/lustre/lustre_user.h. Move lustre_compat25.h and
lustre_patchless_compat.h from lustre/include/linux/ to
lustre/include/ and rename lustre_compat25.h to lustre_compat.h.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2675
Reviewed-on: http://review.whamcloud.com/13271
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Amir Shehata <amir.shehata@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 files changed:
drivers/staging/lustre/lustre/include/cl_object.h
drivers/staging/lustre/lustre/include/linux/lustre_user.h [deleted file]
drivers/staging/lustre/lustre/include/lustre/lustre_user.h
drivers/staging/lustre/lustre/include/lustre_compat.h [moved from drivers/staging/lustre/lustre/include/linux/lustre_compat25.h with 96% similarity]
drivers/staging/lustre/lustre/include/lustre_patchless_compat.h [moved from drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h with 100% similarity]
drivers/staging/lustre/lustre/include/obd_support.h
drivers/staging/lustre/lustre/llite/file.c
drivers/staging/lustre/lustre/llite/llite_internal.h
drivers/staging/lustre/lustre/llite/llite_mmap.c
drivers/staging/lustre/lustre/llite/rw.c
drivers/staging/lustre/lustre/llite/rw26.c
drivers/staging/lustre/lustre/obdclass/obd_mount.c