Re: tracing, dma-buf: Remove unused trace event dma_fence_annotate_wait_on

[Steven Rostedt]

On Mon, 16 Oct 2017 11:15:45 +0200
Daniel Vetter <daniel@xxxxxxxx> wrote:

> On Fri, Oct 13, 2017 at 05:27:59PM +0200, Christian KÃnig wrote:
> > Am 13.10.2017 um 16:06 schrieb Steven Rostedt:  
> > > From: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
> > > 
> > > Commit e941759c74 ("fence: dma-buf cross-device synchronization") added
> > > trace event fence_annotate_wait_on, but never used it. It was renamed
> > > to dma_fence_annotate_wait_on by commit f54d186700 ("dma-buf: Rename
> > > struct fence to dma_fence") but still not used. As defined trace events
> > > have data structures and functions created for them, it is a waste of
> > > memory if they are not used. Remove the unused trace event.
> > > 
> > > Signed-off-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>  
> > 
> > Reviewed-by: Christian KÃnig <christian.koenig@xxxxxxx>  
> 
> Since you have commit rights to drm-misc I assume you'll push this too.
> 

Will it cause conflict if I pull it through my tree? It's just removing
unused traecpoints. I added it to my tree already (but haven't pushed
it to linux-next yet), with the Reviewed by from Christian. Is that OK?
It shouldn't cause any merge conflicts that Linus can't handle.

-- Steve