Commit add2a3ec authored by Tudor Ambarus's avatar Tudor Ambarus Committed by Carlos Llamas
Browse files

Merge 1a9239bb ("Merge tag 'net-next-6.15' of... 

Merge 1a9239bb ("Merge tag 'net-next-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next"

) into android-mainline

Steps on the way to v6.15-rc1

Fix merge conflicts in:
	net/core/dev.c

Change-Id: Iaf2540b93641447d457fe3b9efdb0ca29ab0478a
Signed-off-by: default avatarTudor Ambarus <tudordana@google.com>
parents 611e9d9b 1a9239bb
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment