Am 01.08.23 um 09:56 schrieb Greg KH:

On Thu, Jul 27, 2023 at 03:19:23AM +0000, Jindong Yue wrote:

...

Hi,

Please help backport following two commits to 6.1.y

f781f661e8c9 dma-buf: keep the signaling time of merged fences v3 00ae1491f970 dma-buf: fix an error pointer vs NULL bug

The first one is to fix some Android CTS failures founded with android14-6.1 GKI kernel. run cts -m CtsDeqpTestCases -t dEQP-EGL.functional.get_frame_timestamps* The second patch is to fix the error introduced by the first one.

All now queued up, thanks.

Thanks and please ignore any duplicates. This patch was send out to stable by me and Jindong at the same time.

Regards, Christian.

greg k-h