[PATCH 4/6] staging: lustre: headers: sort headers affected by obdo move

[James Simmons]

From: Ben Evans <bevans@xxxxxxxx>

It was found if you sort the headers alphabetically
that it reduced patch conflicts. This patch sorts
the headers alphabetically and also place linux
header first, then uapi header and finally the
lustre kernel headers.

Signed-off-by: Ben Evans <bevans@xxxxxxxx>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6401
Reviewed-on: http://review.whamcloud.com/16917
Reviewed-on: http://review.whamcloud.com/19266
Reviewed-by: James Simmons <uja.ornl@xxxxxxxxx>
Reviewed-by: Andreas Dilger <andreas.dilger@xxxxxxxxx>
Reviewed-by: John L. Hammond <john.hammond@xxxxxxxxx>
Reviewed-by: Oleg Drokin <oleg.drokin@xxxxxxxxx>
Signed-off-by: James Simmons <jsimmons@xxxxxxxxxxxxx>
---
 drivers/staging/lustre/lustre/osc/osc_request.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/lustre/lustre/osc/osc_request.c b/drivers/staging/lustre/lustre/osc/osc_request.c
index 4d4d3eb..f2365b9 100644
--- a/drivers/staging/lustre/lustre/osc/osc_request.c
+++ b/drivers/staging/lustre/lustre/osc/osc_request.c
@@ -34,19 +34,20 @@
 
 #include "../../include/linux/libcfs/libcfs.h"
 
-#include "../include/lustre_dlm.h"
-#include "../include/lustre_net.h"
 #include "../include/lustre/lustre_user.h"
-#include "../include/obd_cksum.h"
+#include "../include/lustre/lustre_ioctl.h"
 
-#include "../include/lustre_ha.h"
 #include "../include/lprocfs_status.h"
-#include "../include/lustre/lustre_ioctl.h"
 #include "../include/lustre_debug.h"
-#include "../include/lustre_param.h"
 #include "../include/lustre_fid.h"
+#include "../include/lustre_ha.h"
+#include "../include/lustre_obdo.h"
+#include "../include/lustre_param.h"
+
+#include "../include/obd_cksum.h"
 #include "../include/obd_class.h"
 #include "../include/obd.h"
+
 #include "osc_internal.h"
 #include "osc_cl_internal.h"
 
-- 
1.7.1