From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757190AbcLBTnc (ORCPT ); Fri, 2 Dec 2016 14:43:32 -0500 Received: from [160.91.203.10] ([160.91.203.10]:33966 "EHLO smtp1.ccs.ornl.gov" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1754687AbcLBTnb (ORCPT ); Fri, 2 Dec 2016 14:43:31 -0500 From: James Simmons To: Greg Kroah-Hartman , devel@driverdev.osuosl.org, Andreas Dilger , Oleg Drokin Cc: Linux Kernel Mailing List , Lustre Development List , Ben Evans , James Simmons Subject: [PATCH 4/6] staging: lustre: headers: sort headers affected by obdo move Date: Fri, 2 Dec 2016 14:40:48 -0500 Message-Id: <1480707650-24089-5-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1480707650-24089-1-git-send-email-jsimmons@infradead.org> References: <1480707650-24089-1-git-send-email-jsimmons@infradead.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ben Evans 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 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 Reviewed-by: Andreas Dilger Reviewed-by: John L. Hammond Reviewed-by: Oleg Drokin Signed-off-by: James Simmons --- 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