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

Merge e0e14dd3 ("RDMA/rxe: Fix seg fault in rxe_comp_queue_pkt") into android14-5.15-lts 



Steps on the way to 5.15.168

Resolves merge conflicts in:
	sound/usb/pcm.c

Change-Id: Ife8cba2acd242f05d23c66cdb3e0d3a58892a906
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents e2c74441 e0e14dd3
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