Greg Kroah-Hartman f858d3a02f Merge 582cd91f69 ("Merge tag 'for-5.12/block-2021-02-17' of git://git.kernel.dk/linux-block") into android-mainline ... Steps on the way to 5.12-rc1. Resolves merge conflicts in: fs/iomap/direct-io.c Cc: Eric Biggers <ebiggers@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Id09d89b6f3750d7976c293cd8b37843e97c9a777		2021-03-03 10:36:22 +01:00
..
acpi	Merge branch 'acpi-messages'	2021-02-15 17:04:53 +01:00
asm-generic	Power management updates for 5.12-rc1	2021-02-20 21:42:18 -08:00
clocksource
crypto
drm
dt-bindings	USB/Thunderbolt patches for 5.12-rc1	2021-02-20 21:32:37 -08:00
keys
kunit
kvm
linux	Merge 582cd91f69 ("Merge tag 'for-5.12/block-2021-02-17' of git://git.kernel.dk/linux-block") into android-mainline	2021-03-03 10:36:22 +01:00
math-emu
media
memory
misc
net	Merge 51e6d17809 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next") into android-mainline	2021-02-23 08:01:48 +01:00
pcmcia
ras
rdma
scsi
soc	ARM: SoC drivers for v5.12	2021-02-20 18:42:28 -08:00
sound
target
trace	ANDROID: scsi: ufs: replace variants with android vendor hooks	2021-03-01 22:52:14 +00:00
uapi	Merge f7b36dc5cb ("Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt") into android-mainline	2021-02-25 15:33:11 +01:00
vdso
video
xen	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next	2021-02-20 17:45:32 -08:00
OWNERS	ANDROID: add initial set of OWNERS	2021-02-25 13:58:58 +00:00