On Mon, Dec 17, 2012 at 11:17 AM, Len Brown [off-list ref] wrote:

There will be a logical conflict with the uapi changes
which breaks the turbostat build.  It can be fixed this way:

I *think* you meant to point me at the 'release' branch, so that's
what I pulled.

What you actually pointed me at was the 'next' branch:

  git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git next

which had that fixed up as a separate commit (which breaks bisecting
the build, but I guess that doesn't much matter for something small
like turbostat).

            Linus