Re: [PATCH] locking/lockdep: Correct calling tracepoints

[Steven Rostedt]

On Wed, 12 May 2021 16:05:33 +0200
Peter Zijlstra <peterz@xxxxxxxxxxxxx> wrote:

> Thing is, if you look at the list copy:
> 
>   https://lore.kernel.org/lkml/20200821085348.782688941@xxxxxxxxxxxxx/
> 
> things were okay. I suspect there was a conflict at some point and
> resolution got it backwards because the hunks are so similar and I never
> noticed :/

Was this a git merge issue or a quilt merge issue ?

-- Steve