From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752220AbcDRE16 (ORCPT ); Mon, 18 Apr 2016 00:27:58 -0400 Received: from ozlabs.org ([103.22.144.67]:40433 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751358AbcDRE14 (ORCPT ); Mon, 18 Apr 2016 00:27:56 -0400 Date: Mon, 18 Apr 2016 14:27:49 +1000 From: Stephen Rothwell To: Jiri Kosina , Michael Ellerman , Benjamin Herrenschmidt , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Axtens Subject: linux-next: manual merge of the livepatching tree with the powerpc tree Message-ID: <20160418142749.3a5910c6@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 Jiri, Today's linux-next merge of the livepatching tree got a conflict in: arch/powerpc/kernel/process.c between commit: 7f92bc569455 ("powerpc: sparse: Include headers for __weak symbols") from the powerpc tree and commit: 5d31a96e6c01 ("powerpc/livepatch: Add livepatch stack to struct thread_info") from the livepatching 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. -- Cheers, Stephen Rothwell diff --cc arch/powerpc/kernel/process.c index 4695088e7dd2,a290ee374aa0..000000000000 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c @@@ -56,7 -55,8 +56,9 @@@ #include #endif #include +#include + #include + #include #include