Commit 858a257b authored by Carlos Llamas's avatar Carlos Llamas
Browse files

Merge fd8c09ad ("Merge tag 'kbuild-v6.14' of...

Merge fd8c09ad ("Merge tag 'kbuild-v6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild"

) into android-mainline

Steps on the way to 6.14-rc1

Resolves merge conflicts in:
	scripts/mod/modpost.c

Cc: Will McVicker <willmcvicker@google.com>
Cc: Yifan Hong <elsk@google.com>
Change-Id: I7b1f8098ffdfbc5866a47f0bdf6b49eec3edc98b
Signed-off-by: default avatarCarlos Llamas <cmllamas@google.com>
parents fb3da626 fd8c09ad
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment