On 26 May 2014 09:06, Stephen Rothwell <[email protected]> wrote: > Hi all, > > On Sun, 25 May 2014 23:54:35 +0100 Russell King - ARM Linux > <[email protected]> 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é >> > <[email protected]> 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é <[email protected]> >> > > Cc: Russell King <[email protected]> >> > > Cc: David Airlie <[email protected]> >> > > Cc: Maarten Lankhorst <[email protected]> >> > > Cc: Sumit Semwal <[email protected]> >> > >> > Reviewed-by: David Herrmann <[email protected]> >> >> Acked-by: Russell King <[email protected]> >> >> 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. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
