Re: linux-next: manual merge of the dma-buf tree with the staging tree

2014-05-20 Thread Sumit Semwal
On 20 May 2014 12:36, Greg KH wrote: > On Tue, May 20, 2014 at 05:00:31PM +1000, Stephen Rothwell wrote: >> Hi Sumit, >> >> Today's linux-next merge of the dma-buf tree got a conflict in >> drivers/staging/android/sync.c between commit 10f62861b4a2 ("staging: >> android: fix missing a blank line

Re: linux-next: manual merge of the dma-buf tree with the staging tree

2014-05-20 Thread Greg KH
On Tue, May 20, 2014 at 05:00:31PM +1000, Stephen Rothwell wrote: > Hi Sumit, > > Today's linux-next merge of the dma-buf tree got a conflict in > drivers/staging/android/sync.c between commit 10f62861b4a2 ("staging: > android: fix missing a blank line after declarations") from the staging > tree

linux-next: manual merge of the dma-buf tree with the staging tree

2014-05-20 Thread Stephen Rothwell
Hi Sumit, Today's linux-next merge of the dma-buf tree got a conflict in drivers/staging/android/sync.c between commit 10f62861b4a2 ("staging: android: fix missing a blank line after declarations") from the staging tree and commit 85958aff6184 ("android: convert sync to fence api, v5") from the

linux-next: manual merge of the dma-buf tree with the staging tree

2014-05-20 Thread Stephen Rothwell
Hi Sumit, Today's linux-next merge of the dma-buf tree got a conflict in drivers/staging/android/sync.c between commit 10f62861b4a2 (staging: android: fix missing a blank line after declarations) from the staging tree and commit 85958aff6184 (android: convert sync to fence api, v5) from the

Re: linux-next: manual merge of the dma-buf tree with the staging tree

2014-05-20 Thread Greg KH
On Tue, May 20, 2014 at 05:00:31PM +1000, Stephen Rothwell wrote: Hi Sumit, Today's linux-next merge of the dma-buf tree got a conflict in drivers/staging/android/sync.c between commit 10f62861b4a2 (staging: android: fix missing a blank line after declarations) from the staging tree and

Re: linux-next: manual merge of the dma-buf tree with the staging tree

2014-05-20 Thread Sumit Semwal
On 20 May 2014 12:36, Greg KH g...@kroah.com wrote: On Tue, May 20, 2014 at 05:00:31PM +1000, Stephen Rothwell wrote: Hi Sumit, Today's linux-next merge of the dma-buf tree got a conflict in drivers/staging/android/sync.c between commit 10f62861b4a2 (staging: android: fix missing a blank