From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752502AbbJWUAA (ORCPT ); Fri, 23 Oct 2015 16:00:00 -0400 Received: from smtp1.ccs.ornl.gov ([160.91.199.38]:49587 "EHLO smtp1.ccs.ornl.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751705AbbJWT7Z (ORCPT ); Fri, 23 Oct 2015 15:59:25 -0400 From: James Simmons To: Greg Kroah-Hartman , devel@driverdev.osuosl.org, Oleg Drokin , Andreas Dilger Cc: Linux Kernel Mailing List , lustre-devel@lists.lustre.org, frank zago , James Simmons Subject: [PATCH 5/5] staging:lustre: Update license and copyright for kernel comm Date: Fri, 23 Oct 2015 15:59:17 -0400 Message-Id: <1445630357-27149-6-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1445630357-27149-1-git-send-email-jsimmons@infradead.org> References: <1445630357-27149-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: frank zago Point to the right place for GNU license. Update Intel copyright. Update Nathan Rutmans email address. This was broken out of the original patch 14270. Signed-off-by: frank zago Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6245 Reviewed-on: http://review.whamcloud.com/14270 Reviewed-by: Nathan Rutman Reviewed-by: James Simmons Reviewed-by: Dmitry Eremin Reviewed-by: John L. Hammond Reviewed-by: Oleg Drokin Signed-off-by: James Simmons --- .../lustre/lustre/include/lustre_kernelcomm.h | 2 +- .../lustre/lustre/include/uapi_kernelcomm.h | 2 +- .../staging/lustre/lustre/obdclass/kernelcomm.c | 11 +++-------- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/staging/lustre/lustre/include/lustre_kernelcomm.h b/drivers/staging/lustre/lustre/include/lustre_kernelcomm.h index a5baa80..a61263f 100644 --- a/drivers/staging/lustre/lustre/include/lustre_kernelcomm.h +++ b/drivers/staging/lustre/lustre/include/lustre_kernelcomm.h @@ -28,7 +28,7 @@ /* * This file is part of Lustre, http://www.lustre.org/ * - * Author: Nathan Rutman + * Author: Nathan Rutman * * Kernel <-> userspace communication routines. * The definitions below are used in the kernel and userspace. diff --git a/drivers/staging/lustre/lustre/include/uapi_kernelcomm.h b/drivers/staging/lustre/lustre/include/uapi_kernelcomm.h index 5e0b8de..ad608b7 100644 --- a/drivers/staging/lustre/lustre/include/uapi_kernelcomm.h +++ b/drivers/staging/lustre/lustre/include/uapi_kernelcomm.h @@ -28,7 +28,7 @@ /* * This file is part of Lustre, http://www.lustre.org/ * - * Author: Nathan Rutman + * Author: Nathan Rutman * * Kernel <-> userspace communication routines. * The definitions below are used in the kernel and userspace. diff --git a/drivers/staging/lustre/lustre/obdclass/kernelcomm.c b/drivers/staging/lustre/lustre/obdclass/kernelcomm.c index 70bd729..978191a 100644 --- a/drivers/staging/lustre/lustre/obdclass/kernelcomm.c +++ b/drivers/staging/lustre/lustre/obdclass/kernelcomm.c @@ -15,11 +15,7 @@ * * 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. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -27,13 +23,12 @@ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, Intel Corporation. + * Copyright (c) 2012, 2015, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. * - * Author: Nathan Rutman + * Author: Nathan Rutman * * Kernel <-> userspace communication routines. * Using pipes for all arches. -- 1.7.1