Greg Kroah-Hartman 14f1854cdb Merge fecfd01539 ("Merge tag 'leds-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds") into android-mainline ... Steps on the way to 5.12-rc1 Resolves merge conflicts in: drivers/dma-buf/dma-heap.c drivers/dma-buf/heaps/cma_heap.c drivers/dma-buf/heaps/system_heap.c include/linux/dma-heap.h Cc: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ibb32dbdba5183c9e19f5d1e94016cc1ae9616173		2021-03-07 08:45:40 +01:00
..
accounting
arch	objtool updates:	2021-02-23 09:56:13 -08:00
bootconfig	tools/bootconfig: Add tracing_on support to helper scripts	2021-01-14 10:32:20 -05:00
bpf	New features:	2021-02-22 13:59:43 -08:00
build	New features:	2021-02-22 13:59:43 -08:00
cgroup
debugging	docs: Update documentation to reflect what TAINT_CPU_OUT_OF_SPEC means	2020-12-08 10:53:58 -07:00
edid
firewire
firmware
gpio	tools: gpio: remove uAPI v1 code no longer used by selftests	2021-02-15 11:43:28 +01:00
hv
iio
include	idmapped-mounts-v5.12	2021-02-23 13:39:45 -08:00
io_uring
kvm/kvm_stat	tools/kvm_stat: Exempt time-based counters	2020-12-11 19:18:51 -05:00
laptop
leds
lib	New features:	2021-02-22 13:59:43 -08:00
memory-model	tools/memory-model: Fix typo in klitmus7 compatibility table	2021-01-04 14:40:50 -08:00
objtool	Rework of the X86 irq stack handling:	2021-02-24 16:32:23 -08:00
pci
pcmcia
perf	Merge 3a36281a17 ("Merge tag 'perf-tools-for-v5.12-2020-02-19' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux") into android-mainline	2021-03-06 08:40:52 +01:00
power	Merge 5d26c176d5 ("Merge tag 'thermal-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux") into android-mainline	2021-03-03 18:12:28 +01:00
scripts	New features:	2021-02-22 13:59:43 -08:00
spi
testing	Merge fecfd01539 ("Merge tag 'leds-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds") into android-mainline	2021-03-07 08:45:40 +01:00
thermal/tmon
time
tracing	tracing/tools: fix a couple of spelling mistakes	2021-02-25 12:54:16 -05:00
usb
virtio	tools/virtio: add barrier for aarch64	2020-12-18 16:14:30 -05:00
vm
wmi
Makefile	tracing/tools: Add the latency-collector to tools directory	2021-02-12 11:52:59 -05:00