public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "John L. Hammond" <john.hammond@intel.com>
To: <greg@kroah.com>, <andreas.dilger@intel.com>, <oleg.drokin@intel.com>
Cc: <linux-kernel@vger.kernel.org>,
	"John L. Hammond" <john.hammond@intel.com>
Subject: [PATCH 03/11] staging/lustre: remove linux/lustre_dlm.h
Date: Thu, 28 Aug 2014 18:35:11 -0500	[thread overview]
Message-ID: <1409268919-16155-4-git-send-email-john.hammond@intel.com> (raw)
In-Reply-To: <1409268919-16155-1-git-send-email-john.hammond@intel.com>

From: "John L. Hammond" <john.hammond@intel.com>

Remove the superfluous header lustre/include/linux/lustre_dlm.h.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
---
 .../lustre/lustre/include/linux/lustre_dlm.h       |   46 --------------------
 drivers/staging/lustre/lustre/include/lustre_dlm.h |    2 -
 2 files changed, 48 deletions(-)
 delete mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_dlm.h

diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_dlm.h b/drivers/staging/lustre/lustre/include/linux/lustre_dlm.h
deleted file mode 100644
index 207df03..0000000
--- a/drivers/staging/lustre/lustre/include/linux/lustre_dlm.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * GPL HEADER START
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 only,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License version 2 for more details (a copy is included
- * in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * GPL HEADER END
- */
-/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
- * Use is subject to license terms.
- */
-/*
- * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
- */
-
-#ifndef _LINUX_LUSTRE_DLM_H__
-#define _LINUX_LUSTRE_DLM_H__
-
-#ifndef _LUSTRE_DLM_H__
-#error Do not #include this file directly. #include <lprocfs_status.h> instead
-#endif
-
-# include <linux/proc_fs.h>
-#  include <asm/processor.h>
-#  include <linux/bit_spinlock.h>
-
-#endif
diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
index 30b1812f..471eef9 100644
--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
@@ -48,8 +48,6 @@
 #ifndef _LUSTRE_DLM_H__
 #define _LUSTRE_DLM_H__
 
-#include "linux/lustre_dlm.h"
-
 #include "lustre_lib.h"
 #include "lustre_net.h"
 #include "lustre_import.h"
-- 
1.7.9.5


  parent reply	other threads:[~2014-08-28 23:36 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-28 23:35 [PATCH 00/11] staging/lustre flatten some headers John L. Hammond
2014-08-28 23:35 ` [PATCH 01/11] staging/lustre: remove linux/lprocfs_status.h John L. Hammond
2014-08-28 23:35 ` [PATCH 02/11] staging/lustre remove linux/lustre_acl.h John L. Hammond
2014-08-28 23:35 ` John L. Hammond [this message]
2014-08-28 23:35 ` [PATCH 04/11] staging/lustre: remove linux/lustre_handles.h John L. Hammond
2014-08-28 23:35 ` [PATCH 05/11] staging/lustre: move lustre_intent.h to John L. Hammond
2014-08-28 23:35 ` [PATCH 06/11] staging/lustre: remove linux/lustre_lib.h John L. Hammond
2014-08-28 23:35 ` [PATCH 07/11] staging/lustre: remove linux/lustre_log.h John L. Hammond
2014-08-28 23:35 ` [PATCH 08/11] staging/lustre: remove linux/lustre_net.h John L. Hammond
2014-08-28 23:35 ` [PATCH 09/11] staging/lustre: remove linux/lustre_quota.h John L. Hammond
2014-08-28 23:35 ` [PATCH 10/11] staging/lustre: remove linux/obd_class.h John L. Hammond
2014-08-28 23:35 ` [PATCH 11/11] staging/lustre: remove linux/obd_support.h John L. Hammond
2014-08-30 19:19 ` [PATCH 00/11] staging/lustre flatten some headers Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1409268919-16155-4-git-send-email-john.hammond@intel.com \
    --to=john.hammond@intel.com \
    --cc=andreas.dilger@intel.com \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=oleg.drokin@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox