Re: [GIT PULL] power tools for Linux-3.8

[Linus Torvalds]

On Mon, Dec 17, 2012 at 11:17 AM, Len Brown <lenb@xxxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/