Commit 4b815bd4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 0ed2068d ("kbuild: userprogs: use correct linker when mixing clang...


Merge 0ed2068d ("kbuild: userprogs: use correct linker when mixing clang and GNU ld") into android15-6.6-lts

Steps on the way to 6.6.103

Resolves merge conflicts in:
	drivers/ufs/core/ufshcd-priv.h
	drivers/vhost/vsock.c
	fs/crypto/fscrypt_private.h
	mm/mmap.c
	net/core/net_namespace.c
	net/vmw_vsock/virtio_transport.c

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