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

Merge 634710a3 ("net: ipv6: seg6_iptunnel: mitigate 2-realloc issue") into android14-5.15-lts 



Steps on the way to 5.15.179

resolves merge conflicts in:
	drivers/net/gtp.c

Change-Id: I73a3f3e22d7b9c92b631eea599bfd2cc8961aabb
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents defdae77 634710a3
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