Commit 6f32aa91 authored Jan 18, 2026 by Linus Torvalds

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

parents f8907398 84697bf5

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -6421,6 +6421,7 @@ F: include/linux/blk-cgroup.h

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

kernel/cgroup/cgroup.c

+1 −4

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/*
		* Generic process-grouping system.
		*
		@@ -20,10 +21,6 @@
		* 2003-10-22 Updates by Stephen Hemminger.
		* 2004 May-July Rework by Paul Jackson.
		* ---------------------------------------------------
		*
		* This file is subject to the terms and conditions of the GNU General Public
		* License. See the file COPYING in the main directory of the Linux
		* distribution for more details.
		*/

		#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

kernel/cgroup/cpuset.c

+1 −4

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0
		/*
		* kernel/cpuset.c
		*
		@@ -16,10 +17,6 @@
		* 2006 Rework by Paul Menage to use generic cgroups
		* 2008 Rework of the scheduler domains and CPU hotplug handling
		* by Max Krasnyansky
		*
		* This file is subject to the terms and conditions of the GNU General Public
		* License. See the file COPYING in the main directory of the Linux
		* distribution for more details.
		*/
		#include "cpuset-internal.h"

kernel/cgroup/legacy_freezer.c

+1 −8

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: LGPL-2.1
		/*
		* cgroup_freezer.c - control group freezer subsystem
		*
		* Copyright IBM Corporation, 2007
		*
		* Author : Cedric Le Goater <clg@fr.ibm.com>
		*
		* This program is free software; you can redistribute it and/or modify it
		* under the terms of version 2.1 of the GNU Lesser General Public License
		* as published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it would be useful, but
		* WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
		*/

		#include <linux/export.h>