On 26 May 2014 09:06, Stephen Rothwell <sfr at canb.auug.org.au> wrote: > Hi all, > > On Sun, 25 May 2014 23:54:35 +0100 Russell King - ARM Linux <linux at > arm.linux.org.uk> wrote: >> >> On Sun, May 25, 2014 at 02:08:48PM +0200, David Herrmann wrote: >> > >> > On Sat, May 24, 2014 at 11:05 PM, Vincent Stehl? >> > <vincent.stehle at laposte.net> wrote: >> > > The dma_buf_export function was updated in commit 4bcec44ffaf9 'dma-buf: >> > > use >> > > reservation objects' to take a reservation object parameter; update >> > > Armada >> > > export method accordingly. >> > > >> > > This fixes the following compilation error: >> > > >> > > drivers/gpu/drm/armada/armada_gem.c: In function >> > > ?armada_gem_prime_export?: >> > > drivers/gpu/drm/armada/armada_gem.c:544:16: error: macro >> > > "dma_buf_export" requires 5 arguments, but only 4 given >> > > >> > > Signed-off-by: Vincent Stehl? <vincent.stehle at laposte.net> >> > > Cc: Russell King <rmk+kernel at arm.linux.org.uk> >> > > Cc: David Airlie <airlied at linux.ie> >> > > Cc: Maarten Lankhorst <maarten.lankhorst at canonical.com> >> > > Cc: Sumit Semwal <sumit.semwal at linaro.org> >> > >> > Reviewed-by: David Herrmann <dh.herrmann at gmail.com> >> >> Acked-by: Russell King <rmk+kernel at arm.linux.org.uk> >> >> Airlied, can you merge this please? Thanks. > > Except that commit 4bcec44ffaf9 'dma-buf: use reservation objects' > comes from the dma-buf tree, so Sumit needs to add this commit to his > tree. >
Then we should cc him. Dave.
