Skip to content

Commit 6f32aa9

Browse files
committed
Merge tag 'cgroup-for-6.19-rc5-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fixes from Tejun Heo: - Add Chen Ridong as cpuset reviewer - Add SPDX license identifiers to cgroup files that were missing them * tag 'cgroup-for-6.19-rc5-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: kernel: cgroup: Add LGPL-2.1 SPDX license ID to legacy_freezer.c kernel: cgroup: Add SPDX-License-Identifier lines MAINTAINERS: Add Chen Ridong as cpuset reviewer
2 parents f890739 + 84697bf commit 6f32aa9

File tree

4 files changed

+4
-16
lines changed

4 files changed

+4
-16
lines changed

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6421,6 +6421,7 @@ F: include/linux/blk-cgroup.h
64216421

64226422
CONTROL GROUP - CPUSET
64236423
M: Waiman Long <longman@redhat.com>
6424+
R: Chen Ridong <chenridong@huaweicloud.com>
64246425
L: cgroups@vger.kernel.org
64256426
S: Maintained
64266427
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git

kernel/cgroup/cgroup.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// SPDX-License-Identifier: GPL-2.0
12
/*
23
* Generic process-grouping system.
34
*
@@ -20,10 +21,6 @@
2021
* 2003-10-22 Updates by Stephen Hemminger.
2122
* 2004 May-July Rework by Paul Jackson.
2223
* ---------------------------------------------------
23-
*
24-
* This file is subject to the terms and conditions of the GNU General Public
25-
* License. See the file COPYING in the main directory of the Linux
26-
* distribution for more details.
2724
*/
2825

2926
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

kernel/cgroup/cpuset.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// SPDX-License-Identifier: GPL-2.0
12
/*
23
* kernel/cpuset.c
34
*
@@ -16,10 +17,6 @@
1617
* 2006 Rework by Paul Menage to use generic cgroups
1718
* 2008 Rework of the scheduler domains and CPU hotplug handling
1819
* by Max Krasnyansky
19-
*
20-
* This file is subject to the terms and conditions of the GNU General Public
21-
* License. See the file COPYING in the main directory of the Linux
22-
* distribution for more details.
2320
*/
2421
#include "cpuset-internal.h"
2522

kernel/cgroup/legacy_freezer.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
1+
// SPDX-License-Identifier: LGPL-2.1
12
/*
23
* cgroup_freezer.c - control group freezer subsystem
34
*
45
* Copyright IBM Corporation, 2007
56
*
67
* Author : Cedric Le Goater <clg@fr.ibm.com>
7-
*
8-
* This program is free software; you can redistribute it and/or modify it
9-
* under the terms of version 2.1 of the GNU Lesser General Public License
10-
* as published by the Free Software Foundation.
11-
*
12-
* This program is distributed in the hope that it would be useful, but
13-
* WITHOUT ANY WARRANTY; without even the implied warranty of
14-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
158
*/
169

1710
#include <linux/export.h>

0 commit comments

Comments
 (0)