Will McVicker 558762106d Merge 8afc66e8d4 ("Merge tag 'kbuild-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild") into android-mainline ...

Steps on the way to 6.1-rc1

Resolves merge conflicts in:
	Makefile
	scripts/Makefile.modfinal
	scripts/Makefile.modpost

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I8578b7f47932c7c57126531e5251daea07cc551e
Signed-off-by: Will McVicker <willmcvicker@google.com>

2022-10-14 23:13:48 -07:00

..

.gitignore

kbuild: build init/built-in.a just once

2022-09-29 04:40:15 +09:00

build-version

kbuild: build init/built-in.a just once

2022-09-29 04:40:15 +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_initrd.c

freezer,umh: Clean up freezer/initrd interaction

2022-09-07 21:53:48 +02:00

do_mounts_rd.c

init: add an init_unlink helper

2020-07-31 08:17:52 +02:00

do_mounts.c

block: remove genhd.h

2022-02-02 07:49:59 -07:00

do_mounts.h

init: add an init_mknod helper

2020-07-31 08:17:54 +02:00

init_task.c

ANDROID: Configure out the macros in android_kabi and android_vendor

2022-10-10 16:46:40 +05:30

initramfs.c

Merge tag 'kthread-cleanups-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2022-06-03 16:03:05 -07:00

Kconfig

Merge 493ffd6605 ("Merge tag 'ucount-rlimits-cleanups-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace") into android-mainline

2022-10-12 09:37:52 +02:00

Kconfig.gki

ANDROID: introduce CONFIG_GKI_NET_XFRM_HACKS

2022-10-11 19:37:27 +00:00

main.c

Merge 8adc0486f3 ("Merge tag 'random-6.1-rc1-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random") into android-mainline

2022-10-14 10:07:05 +02:00

Makefile

kbuild: generate include/generated/compile.h in top Makefile

2022-09-29 04:40:15 +09:00

noinitramfs.c

init: move usermodehelper_enable() to populate_rootfs()

2021-09-08 11:50:27 -07:00

version-timestamp.c

kbuild: build init/built-in.a just once

2022-09-29 04:40:15 +09:00

version.c

kbuild: build init/built-in.a just once

2022-09-29 04:40:15 +09:00