Commit 6ca04bd7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge b250e6d1 ("Merge tag 'kbuild-v5.15' of...

Merge b250e6d1 ("Merge tag 'kbuild-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild"

) into android-mainline

Steps on the way to 5.15-rc1

Fixed up merge conflicts in:
	scripts/Makefile.modfinal

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I3a916b7267fc2e4ed2f2bd308b9cff8ca9430660
parents c2b303f9 b250e6d1
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment