Merge remote-tracking branch 'torvalds/master' into perf/core (37b3fa0e) · Commits · EulixOS / Software / Kernel

Documentation/admin-guide/cgroup-v2.rst

+3 −3

Original line number	Diff line number	Diff line
		@@ -1029,7 +1029,7 @@ All time durations are in microseconds.
		one number is written, $MAX is updated.

		cpu.pressure
		A read-only nested-key file which exists on non-root cgroups.
		A read-write nested-keyed file.

		Shows pressure stall information for CPU. See
		:ref:`Documentation/accounting/psi.rst <psi>` for details.
		@@ -1475,7 +1475,7 @@ PAGE_SIZE multiple when read back.
		reduces the impact on the workload and memory management.

		memory.pressure
		A read-only nested-key file which exists on non-root cgroups.
		A read-only nested-keyed file.

		Shows pressure stall information for memory. See
		:ref:`Documentation/accounting/psi.rst <psi>` for details.
		@@ -1714,7 +1714,7 @@ IO Interface Files
		8:16 rbps=2097152 wbps=max riops=max wiops=max

		io.pressure
		A read-only nested-key file which exists on non-root cgroups.
		A read-only nested-keyed file.

		Shows pressure stall information for IO. See
		:ref:`Documentation/accounting/psi.rst <psi>` for details.

+7 −7

Original line number	Diff line number	Diff line
		@@ -4468,7 +4468,7 @@ F: include/linux/console*

		CONTROL GROUP (CGROUP)
		M: Tejun Heo <tj@kernel.org>
		M: Li Zefan <lizefan@huawei.com>
		M: Zefan Li <lizefan.x@bytedance.com>
		M: Johannes Weiner <hannes@cmpxchg.org>
		L: cgroups@vger.kernel.org
		S: Maintained
		@@ -4492,11 +4492,9 @@ F: block/blk-throttle.c
		F: include/linux/blk-cgroup.h

		CONTROL GROUP - CPUSET
		M: Li Zefan <lizefan@huawei.com>
		M: Zefan Li <lizefan.x@bytedance.com>
		L: cgroups@vger.kernel.org
		S: Maintained
		W: http://www.bullopensource.org/cpuset/
		W: http://oss.sgi.com/projects/cpusets/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
		F: Documentation/admin-guide/cgroup-v1/cpusets.rst
		F: include/linux/cpuset.h
		@@ -9561,14 +9559,16 @@ F: drivers/hwmon/k8temp.c
		KASAN
		M: Andrey Ryabinin <ryabinin.a.a@gmail.com>
		R: Alexander Potapenko <glider@google.com>
		R: Andrey Konovalov <andreyknvl@gmail.com>
		R: Dmitry Vyukov <dvyukov@google.com>
		L: kasan-dev@googlegroups.com
		S: Maintained
		F: Documentation/dev-tools/kasan.rst
		F: arch/*/include/asm/kasan.h
		F: arch//include/asm/kasan.h
		F: arch//mm/kasan_init
		F: include/linux/kasan*.h
		F: lib/test_kasan.c
		F: lib/Kconfig.kasan
		F: lib/test_kasan*.c
		F: mm/kasan/
		F: scripts/Makefile.kasan

		@@ -9583,7 +9583,7 @@ F: scripts/kconfig/

		KCOV
		R: Dmitry Vyukov <dvyukov@google.com>
		R: Andrey Konovalov <andreyknvl@google.com>
		R: Andrey Konovalov <andreyknvl@gmail.com>
		L: kasan-dev@googlegroups.com
		S: Maintained
		F: Documentation/dev-tools/kcov.rst

+2 −2

Original line number	Diff line number	Diff line
		@@ -2,8 +2,8 @@
		VERSION = 5
		PATCHLEVEL = 11
		SUBLEVEL = 0
		EXTRAVERSION = -rc7
		NAME = Kleptomaniac Octopus
		EXTRAVERSION =
		NAME = 💕 Valentine's Day Edition 💕

		# DOCUMENTATION
		# To see a list of typical targets execute "make help"

+0 −2

Original line number	Diff line number	Diff line
		@@ -370,8 +370,6 @@ static int __init xen_guest_init(void)
		return -ENOMEM;
		}
		gnttab_init();
		if (!xen_initial_domain())
		xenbus_probe();

		/*
		* Making sure board specific code will not set up ops for

+1 −5

Original line number	Diff line number	Diff line
		@@ -1701,16 +1701,12 @@ static void bti_enable(const struct arm64_cpu_capabilities *__unused)
		#ifdef CONFIG_ARM64_MTE
		static void cpu_enable_mte(struct arm64_cpu_capabilities const *cap)
		{
		static bool cleared_zero_page = false;

		/*
		* Clear the tags in the zero page. This needs to be done via the
		* linear map which has the Tagged attribute.
		*/
		if (!cleared_zero_page) {
		cleared_zero_page = true;
		if (!test_and_set_bit(PG_mte_tagged, &ZERO_PAGE(0)->flags))
		mte_clear_page_tags(lm_alias(empty_zero_page));
		}

		kasan_init_hw_tags_cpu();
		}