From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754680AbcLNDnj (ORCPT ); Tue, 13 Dec 2016 22:43:39 -0500 Received: from ozlabs.org ([103.22.144.67]:48609 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752492AbcLNDnh (ORCPT ); Tue, 13 Dec 2016 22:43:37 -0500 Date: Wed, 14 Dec 2016 14:42:36 +1100 From: Stephen Rothwell To: Andrew Morton , Jonathan Corbet Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Holmberg , Andreas Platschek Subject: linux-next: manual merge of the akpm-current tree with the jc_docs tree Message-ID: <20161214144236.5053299e@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 Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: lib/Kconfig.debug between commit: 63d0977c0e85 ("lib/Kconfig.debug: correct documentation paths") from the jc_docs tree and commit: 2c81218d9f29 ("Kconfig: lib/Kconfig.debug: fix references to Documenation") from the akpm-current tree. I fixed it up (I just used the version from the jc_docs tree) 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