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
..
Kconfig	Merge 6efb943b86 Linux 5.13-rc1 into android-mainline	2021-05-15 09:09:01 +01:00
Kconfig.gki	ANDROID: Kconfig.gki Add SND_SOC_TOPOLOGY	2021-04-13 20:21:35 +00:00
Makefile	md: move the early init autodetect code to drivers/md/	2020-07-16 15:34:47 +02:00
calibrate.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
do_mounts.c	block: merge struct block_device and struct hd_struct	2020-12-01 14:53:40 -07:00
do_mounts.h	init: add an init_mknod helper	2020-07-31 08:17:54 +02:00
do_mounts_initrd.c	Merge branch 'hch.init_path' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2020-08-07 09:40:34 -07:00
do_mounts_rd.c	init: add an init_unlink helper	2020-07-31 08:17:52 +02:00
init_task.c	seccomp: Fix CONFIG tests for Seccomp_filters	2021-03-30 22:33:50 -07:00
initramfs.c	init/initramfs.c: do unpacking asynchronously	2021-05-07 00:26:33 -07:00
main.c	Merge branch 'akpm' (patches from Andrew)	2021-05-07 00:34:51 -07:00
noinitramfs.c	init: add an init_mknod helper	2020-07-31 08:17:54 +02:00
version.c	kbuild: add an elfnote for whether vmlinux is built with lto	2021-04-25 05:25:42 +09:00