From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757849AbcGKHNO (ORCPT ); Mon, 11 Jul 2016 03:13:14 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36253 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757503AbcGKHNM (ORCPT ); Mon, 11 Jul 2016 03:13:12 -0400 Date: Mon, 11 Jul 2016 09:13:07 +0200 From: Ingo Molnar To: Stephen Rothwell Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Kees Cook , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Len Brown Subject: Re: linux-next: manual merge of the tip tree with the kspp tree Message-ID: <20160711071307.GB6835@gmail.com> References: <20160711151100.02c0b012@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160711151100.02c0b012@canb.auug.org.au> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > > arch/x86/kernel/x86_init.c > > between commit: > > 255303026193 ("x86: apply more __ro_after_init and const") > > from the kspp tree and commit: Kees, did you plan to submit this patch (and any other pending x86 patches) to the x86 tree? > > 1bf8915ae515 ("x86/tsc: Enumerate SKL cpu_khz and tsc_khz via CPUID") > > from the tip tree. > > I fixed it up (see below) 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. Looks good to me! Thanks, Ingo