Commit b4478a08 authored Jan 26, 2021 by Linus Walleij

Merge tag 'v5.11-rc2' into devel

Linux 5.11-rc2

parents 3bbf9b89 e71ba945

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -4588,7 +4588,7 @@ B: https://bugzilla.kernel.org
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
		F: Documentation/admin-guide/pm/cpuidle.rst
		F: Documentation/driver-api/pm/cpuidle.rst
		F: drivers/cpuidle/*
		F: drivers/cpuidle/
		F: include/linux/cpuidle.h

		CPU POWER MONITORING SUBSYSTEM

Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		VERSION = 5
		PATCHLEVEL = 11
		SUBLEVEL = 0
		EXTRAVERSION = -rc1
		EXTRAVERSION = -rc2
		NAME = Kleptomaniac Octopus

		# DOCUMENTATION

arch/alpha/include/asm/local64.h

deleted100644 → 0

+0 −1

Original line number	Diff line number	Diff line
		#include <asm-generic/local64.h>

arch/arc/include/asm/Kbuild

+0 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		generic-y += extable.h
		generic-y += kvm_para.h
		generic-y += local64.h
		generic-y += mcs_spinlock.h
		generic-y += parport.h
		generic-y += user.h

arch/arm/include/asm/Kbuild

+0 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@
		generic-y += early_ioremap.h
		generic-y += extable.h
		generic-y += flat.h
		generic-y += local64.h
		generic-y += parport.h

		generated-y += mach-types.h