• Ingo Molnar's avatar
    Merge branch 'core/rcu' into perf/core · 4553f0b9
    Ingo Molnar authored
    
    
    Steve Rostedt asked for the merge of a single commit, into both
    the RCU and the perf/tracing tree:
    
     | Josh made a change to the tracing code that affects both the
     | work Paul McKenney and I are currently doing. At the last
     | Kernel Summit back in August, Linus said when such a case
     | exists, it is best to make a separate branch based off of his
     | tree and place the change there. This way, the repositories
     | that need to share the change can both pull them in and the
     | SHA1 will match for both. Whichever branch is pulled in first
     | by Linus will also pull in the necessary change for the other
     | branch as well.
    Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
    4553f0b9
Makefile 46.2 KB