Ingo Molnar 6255b48aeb Merge tag 'v5.17-rc5' into sched/core, to resolve conflicts ...

New conflicts in sched/core due to the following upstream fixes:

  44585f7bc0 ("psi: fix "defined but not used" warnings when CONFIG_PROC_FS=n")
  a06247c680 ("psi: Fix uaf issue when psi trigger is destroyed while being polled")

Conflicts:
	include/linux/psi_types.h
	kernel/sched/psi.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2022-02-21 11:53:51 +01:00

..

ABI

Merge tag 'for-v5.17-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply

2022-02-20 11:07:46 -08:00

accounting

Merge tag 'sched_urgent_for_v5.17_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2022-01-23 17:35:27 +02:00

admin-guide

Merge tag 'v5.17-rc5' into sched/core, to resolve conflicts

2022-02-21 11:53:51 +01:00

arc

…

arm

Documentation: arm: marvell: Extend Avanta list

2022-01-27 11:22:34 -07:00

arm64

KVM: arm64: Workaround Cortex-A510's single-step and PAC trap errata

2022-02-03 09:22:30 +00:00

block

…

bpf

…

cdrom

…

core-api

…

cpu-freq

…

crypto

…

dev-tools

Merge tag 'linux-kselftest-kunit-fixes-5.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

2022-02-10 15:39:59 -08:00

devicetree

Merge tag 'sound-5.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2022-02-18 09:20:52 -08:00

doc-guide

…

driver-api

Merge tag 'docs-5.17-2' of git://git.lwn.net/linux

2022-01-22 09:02:57 +02:00

fault-injection

…

fb

…

features

…

filesystems

netfs, cachefiles: Add a method to query presence of data in the cache

2022-02-01 10:29:18 -06:00

firmware_class

…

firmware-guide

…

fpga

…

gpu

Revert "fbcon: Disable accelerated scrolling"

2022-02-02 15:15:11 +01:00

hid

…

hwmon

…

i2c

…

ia64

…

ide

…

iio

…

infiniband

…

input

…

isdn

…

kbuild

…

kernel-hacking

docs: fix typo in Documentation/kernel-hacking/locking.rst

2022-01-27 11:22:33 -07:00

leds

…

litmus-tests

…

livepatch

…

locking

…

m68k

…

maintainer

…

mhi

…

mips

…

misc-devices

…

netlabel

…

networking

…

nios2

…

nvdimm

…

openrisc

…

parisc

…

PCI

…

pcmcia

…

power

…

powerpc

…

process

Merge tag 'kbuild-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2022-01-19 11:15:19 +02:00

RCU

…

riscv

riscv: Move KASAN mapping next to the kernel mapping

2022-01-19 17:54:04 -08:00

s390

…

scheduler

sched/numa-balancing: Move some document to make it consistent with the code

2022-02-11 23:30:08 +01:00

scsi

…

security

…

sh

…

sound

…

sparc

…

sphinx

…

sphinx-static

…

spi

…

staging

Merge tag 'docs-5.17-2' of git://git.lwn.net/linux

2022-01-22 09:02:57 +02:00

target

…

timers

…

tools

docs: Hook the RTLA documents into the kernel docs build

2022-01-27 11:20:39 -07:00

trace

Merge tag 'docs-5.17-2' of git://git.lwn.net/linux

2022-01-22 09:02:57 +02:00

translations

…

tty

…

usb

…

userspace-api

xen: update missing ioctl magic numers documentation

2022-02-03 08:24:34 +01:00

virt

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2022-01-28 19:00:26 +02:00

vm

docs/vm: Fix typo in *harden*

2022-01-27 11:22:34 -07:00

w1

…

watchdog

…

x86

…

xtensa

…

.gitignore

…

arch.rst

…

asm-annotations.rst

…

atomic_bitops.txt

…

atomic_t.txt

…

Changes

…

CodingStyle

…

conf.py

…

COPYING-logo

…

docutils.conf

…

dontdiff

…

index.rst

docs: Hook the RTLA documents into the kernel docs build

2022-01-27 11:20:39 -07:00

Kconfig

…

logo.gif

…

Makefile

…

memory-barriers.txt

…

SubmittingPatches

…

watch_queue.rst

…