linux-next: manual merge of the tip tree with the pm tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the tip tree with the pm tree
Date	2016-03-15 03:00 +0100
Message-ID	<rcMr7-3zb-5@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  tools/power/x86/turbostat/turbostat.c

between commit:

  58cc30a4e608 ("tools/power turbostat: fix compiler warnings")

from the pm tree and commit:

  1b69317d2dc8 ("tools/power turbostat: fix various build warnings")

from the tip tree.

I fixed it up (I arbitrarily used the pm tree version) and can carry
the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the tip tree with the pm tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-15 03:00 +0100

csiph-web