From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751930AbcDSB4X (ORCPT ); Mon, 18 Apr 2016 21:56:23 -0400 Received: from ozlabs.org ([103.22.144.67]:52627 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751091AbcDSB4W (ORCPT ); Mon, 18 Apr 2016 21:56:22 -0400 Message-ID: <1461030979.25103.4.camel@ellerman.id.au> Subject: Re: linux-next: manual merge of the livepatching tree with the powerpc tree From: Michael Ellerman To: Stephen Rothwell , Jiri Kosina , Benjamin Herrenschmidt , linuxppc-dev@lists.ozlabs.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Axtens Date: Tue, 19 Apr 2016 11:56:19 +1000 In-Reply-To: <20160418142749.3a5910c6@canb.auug.org.au> References: <20160418142749.3a5910c6@canb.auug.org.au> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.16.5-1ubuntu3.1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2016-04-18 at 14:27 +1000, Stephen Rothwell wrote: > 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. Thanks. This should go away tomorrow because then my next will have the topic branch merged. cheers