Lee Jones 85adc860fd Merge 6efb943b86 Linux 5.13-rc1 into android-mainline ... One giant leap, all the way up to 5.13-rc1 Also take the opportunity to re-align (a.k.a. fix a couple of previous merge conflict fix-up issues) which occurred during this merge-window. Fixes: 4797acfb9c ("Merge 16b3d0cf5b Merge tag 'sched-core-2021-04-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into android-mainline") Fixes: 92f282f338 ("Merge 8ca5297e7e Merge tag 'kconfig-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild into android-mainline") Signed-off-by: Lee Jones <lee.jones@linaro.org> Change-Id: Ie9389f595776e8f66bba6eaf0fa7a3587c6a5749		2021-05-15 09:09:01 +01:00
..
acpi	Merge branches 'acpi-cppc', 'acpi-video' and 'acpi-utils'	2021-04-26 17:04:27 +02:00
asm-generic	mm: remove xlate_dev_kmem_ptr()	2021-05-07 00:26:34 -07:00
clocksource	ARM: platform support for Apple M1	2021-04-26 12:30:36 -07:00
crypto	crypto: poly1305 - fix poly1305_core_setkey() declaration	2021-04-02 18:28:12 +11:00
drm	Merge 16b3d0cf5b Merge tag 'sched-core-2021-04-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into android-mainline	2021-05-10 10:28:52 +01:00
dt-bindings	Merge d0034a7a4a Merge branch 'next' into for-linus into android-mainline	2021-05-13 12:37:29 +01:00
keys	integrity-v5.13	2021-05-01 15:32:18 -07:00
kunit	kunit: fix -Wunused-function warning for __kunit_fail_current_test	2021-04-06 15:22:39 -06:00
kvm	Merge branch 'kvm-arm64/kill_oprofile_dependency' into kvmarm-master/next	2021-04-22 13:41:49 +01:00
linux	Merge 6efb943b86 Linux 5.13-rc1 into android-mainline	2021-05-15 09:09:01 +01:00
math-emu
media	Merge 16b3d0cf5b Merge tag 'sched-core-2021-04-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into android-mainline	2021-05-10 10:28:52 +01:00
memory
misc
net	Merge d652502ef4 Merge tag 'ovl-update-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs into android-mainline	2021-05-12 15:54:32 +01:00
pcmcia
ras
rdma	RDMA/restrack: Add support to get resource tracking for SRQ	2021-04-22 10:30:27 -03:00
scsi	SCSI misc on 20210428	2021-04-28 17:22:10 -07:00
soc	Networking changes for 5.13.	2021-04-29 11:57:23 -07:00
sound	Merge d652502ef4 Merge tag 'ovl-update-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs into android-mainline	2021-05-12 15:54:32 +01:00
target
trace	Merge 6efb943b86 Linux 5.13-rc1 into android-mainline	2021-05-15 09:09:01 +01:00
uapi	Merge 6efb943b86 Linux 5.13-rc1 into android-mainline	2021-05-15 09:09:01 +01:00
vdso	time64.h: Consolidated PSEC_PER_SEC definition	2021-04-06 16:32:17 -07:00
video
xen	Merge branch 'akpm' (patches from Andrew)	2021-05-07 00:34:51 -07:00
OWNERS	Revert "ANDROID: Improve OWNERS file definitions"	2021-05-07 10:12:00 +00:00