Greg Kroah-Hartman c0d1ebaba1 Merge 2d338201d5 ("Merge branch 'akpm' (patches from Andrew)") into android-mainline ... Steps on the way to 5.15-rc1 Resolves merge conflict in: fs/proc/base.c Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ic554ca8447961e52fbc6f27d91470a816b59a771		2021-09-15 14:34:48 +02:00
..
Kconfig	ANDROID: Revert "Enable '-Werror' by default for all kernel builds"	2021-09-14 15:52:29 +02:00
Kconfig.gki	ANDROID: GKI: enable hidden configs for DMA	2021-07-08 01:46:01 +00:00
Makefile	init: use $(call cmd,) for generating include/generated/compile.h	2021-05-27 04:01:50 +09: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: remove CONFIG_DEBUG_BLOCK_EXT_DEVT	2021-08-24 06:42:40 -06: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	sched: Introduce task_struct::user_cpus_ptr to track requested affinity	2021-08-20 12:33:00 +02:00
initramfs.c	init: move usermodehelper_enable() to populate_rootfs()	2021-09-08 11:50:27 -07:00
main.c	Merge branch 'akpm' (patches from Andrew)	2021-09-08 12:55:35 -07:00
noinitramfs.c	init: move usermodehelper_enable() to populate_rootfs()	2021-09-08 11:50:27 -07:00
version.c	kbuild: add an elfnote for whether vmlinux is built with lto	2021-04-25 05:25:42 +09:00