From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933369AbcCOBzk (ORCPT ); Mon, 14 Mar 2016 21:55:40 -0400 Received: from ozlabs.org ([103.22.144.67]:59158 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932768AbcCOBzj (ORCPT ); Mon, 14 Mar 2016 21:55:39 -0400 Date: Tue, 15 Mar 2016 12:55:36 +1100 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , "Rafael J. Wysocki" Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Colin Ian King Subject: linux-next: manual merge of the tip tree with the pm tree Message-ID: <20160315125536.6e0698a6@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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