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
..
asm-generic	fs: add mount_setattr()	2021-01-24 14:42:45 +01:00
drm	- HDCP 2.2 and HDCP 1.4 Gen12 DP MST support (Anshuman)	2021-01-29 17:05:15 +10:00
linux	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
misc	habanalabs: return block size + block ID	2021-02-08 18:20:08 +02:00
mtd	MTD: mtd-abi.h: drop a duplicated word	2020-08-02 23:00:10 +02:00
rdma	Linux 5.11	2021-02-18 11:19:29 -04:00
scsi	scsi: fc: Update formal FPIN descriptor definitions	2020-10-26 18:06:45 -04:00
sound	Auxiliary Bus support tag for 5.11-rc1	2020-12-04 20:39:45 +00:00
video
xen	xen/gntdev: gntdev.h: drop a duplicated word	2020-08-03 07:46:42 +02:00
Kbuild