Hi Ingo, On Mon, 6 Jul 2015 11:41:17 +0200 Ingo Molnar <mi...@kernel.org> wrote: > > On next linux-next iteration you should be able to just drop your merge > conflict > resolution, and use the -tip tree as-is with no extra fixups.
I dropped the patch I had yesterday and just merged perf-urgent-for-linus from the tip tree into my fixes tree (since I merge my fixes tree immediately on top of Linus' tree and before I try to do any builds). I will drop that merge when Linus takes your pull request. -- Cheers, Stephen Rothwell s...@canb.auug.org.au
pgpE6U7zZm0NA.pgp
Description: OpenPGP digital signature
