Merge 45cb99c5 ("xfrm: respect ip protocols rules criteria when performing...

Merge 45cb99c5 ("xfrm: respect ip protocols rules criteria when performing dst lookups") into android14-5.15-lts

Steps on the way to 5.15.170

Resolves merge conflicts in:
	net/ipv4/xfrm4_policy.c
	net/ipv6/xfrm6_policy.c

by merging around these two commits that are not needed as they fix up
things that we have already reverted in earlier kernel releases due to
ABI breaks.  If they are needed, they can come back later in an abi-safe
way.

Change-Id: I3dd73644b579d477e49687383d6d80c7f933f89e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>