On 20 May 2014 12:36, Greg KH <[email protected]> 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 after declarations") from the staging >> tree and commit 85958aff6184 ("android: convert sync to fence api, v5") >> from the dma-buf tree. >> >> I fixed it up (I just used the dma-buf tree version of conflicting >> sections) and can carry the fix as necessary (no action is required). > > Sounds good, thanks. > > greg k-h
Sure Stephen, Sounds good! Thanks. Sumit -- 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/
