Merge branch 'nfp-dma-adjust_head-fixes'