[Linaro-mm-sig] [PATCH 1/2] dma-buf/sync-file: fix logic error in new fence merge code