Hello Qu, On Thu, Jan 25, 2024 at 02:17:08PM +1030, Qu Wenruo wrote: > From: Filipe Manana <fdmanana@xxxxxxxx> Many thanks for the backport! Conflict resolution looks surprisingly clean! Please, give some time for verification. > [ Upstream commit b4c639f699349880b7918b861e1bd360442ec450 ] PS: Not sure the "Upstream commit" is the right one. Should it be 9b378f6ad48cfa195ed868db9123c09ee7ec5ea2 ? BR, Eugeniu