diff options
| author | Mark Brown <broonie@kernel.org> | 2019-06-10 19:52:53 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-06-10 19:52:53 +0200 |
| commit | 4343f61103cdb8ccd6f3d5dd7168f1176a1cee37 (patch) | |
| tree | 3db0a2e099cf7feb0c2d60d2a4bf1bf10d5253db /fs/ocfs2/cluster/heartbeat.h | |
| parent | spi: Use struct_size() helper (diff) | |
| parent | Linux 5.2-rc4 (diff) | |
| download | linux-4343f61103cdb8ccd6f3d5dd7168f1176a1cee37.tar.xz linux-4343f61103cdb8ccd6f3d5dd7168f1176a1cee37.zip | |
Merge tag 'v5.2-rc4' into spi-5.3
Linux 5.2-rc4
Diffstat (limited to 'fs/ocfs2/cluster/heartbeat.h')
| -rw-r--r-- | fs/ocfs2/cluster/heartbeat.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/fs/ocfs2/cluster/heartbeat.h b/fs/ocfs2/cluster/heartbeat.h index a9e67efc0004..7f37540ac4ab 100644 --- a/fs/ocfs2/cluster/heartbeat.h +++ b/fs/ocfs2/cluster/heartbeat.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* -*- mode: c; c-basic-offset: 8; -*- * vim: noexpandtab sw=8 ts=8 sts=0: * @@ -6,22 +7,6 @@ * Function prototypes * * Copyright (C) 2004 Oracle. All rights reserved. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * 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 for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 021110-1307, USA. - * */ #ifndef O2CLUSTER_HEARTBEAT_H |