From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751261AbcFIEey (ORCPT ); Thu, 9 Jun 2016 00:34:54 -0400 Received: from ozlabs.org ([103.22.144.67]:48362 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932630AbcFIEek (ORCPT ); Thu, 9 Jun 2016 00:34:40 -0400 Date: Thu, 9 Jun 2016 14:34:37 +1000 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, Jacob Pan , Dave Hansen Subject: linux-next: manual merge of the tip tree with the pm tree Message-ID: <20160609143437.760a6b0f@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: drivers/powercap/intel_rapl.c between commit: 9b1d0794b70d ("powercap / RAPL: add support for Skylake-X") from the pm tree and commit: 62d167330679 ("x86, powercap, rapl: Use Intel model macros intead of open-coding") 0bb04b5f2c24 ("x86, powercap, rapl: Reorder CPU detection table") d40671e30cb4 ("x86, powercap, rapl: Add Skylake Server model number") from the tip tree. I fixed it up (I think that last tip tree commit does the same as the pm tree one, so I used that) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell