Re: [PATCH 19/21] tracing: Account for preempt off in preempt_schedule()

Peter Zijlstra
2011-09-23T13:25:15Z

On Fri, 2011-09-23 at 07:19 -0400, Steven Rostedt wrote:
> Yes, that's the way git usually works

Its also one of the reasons I hate git. In this case the fixup will live
in some merge commit and be totally lost to the normal way of things.

I absolutely detest non empty merge commits.