From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751751AbcF0Db2 (ORCPT ); Sun, 26 Jun 2016 23:31:28 -0400 Received: from ozlabs.org ([103.22.144.67]:33705 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751601AbcF0Db1 (ORCPT ); Sun, 26 Jun 2016 23:31:27 -0400 Date: Mon, 27 Jun 2016 13:31:24 +1000 From: Stephen Rothwell To: Jonathan Corbet , Dave Airlie Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jani Nikula , Daniel Vetter Subject: linux-next: manual merge of the jc_docs tree with the drm tree Message-ID: <20160627133124.4e3e8dfd@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 Jonathan, Today's linux-next merge of the jc_docs tree got a conflict in: Documentation/index.rst between commit: cb597fcea5c2 ("Documentation/gpu: add new gpu.rst converted from DocBook gpu.tmpl") from the drm tree and commit: 17defc282fe6 ("Documentation: add meta-documentation for Sphinx and kernel-doc") from the jc_docs 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 Documentation/index.rst index dacc77b43c29,f92854f01773..000000000000 --- a/Documentation/index.rst +++ b/Documentation/index.rst @@@ -13,8 -13,8 +13,10 @@@ Contents .. toctree:: :maxdepth: 2 + kernel-documentation + + gpu/index + Indices and tables ==================