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
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
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
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
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
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
6 matches
Mail list logo