Merge f31fd0b3 ("Merge branch 'pcs-xpcs-cleanups-batch-2'") into android-mainline

Steps on the way to 6.13-rc1

Resolves merge conflicts in:
	drivers/net/ethernet/intel/ice/ice_ptp_hw.h

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