From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755418AbcHSBwV (ORCPT ); Thu, 18 Aug 2016 21:52:21 -0400 Received: from ozlabs.org ([103.22.144.67]:38132 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755389AbcHSBwS (ORCPT ); Thu, 18 Aug 2016 21:52:18 -0400 Date: Fri, 19 Aug 2016 11:52:15 +1000 From: Stephen Rothwell To: Jonathan Corbet , Daniel Vetter , Intel Graphics , DRI Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Markus Heiser Subject: linux-next: manual merge of the jc_docs tree with the drm-misc tree Message-ID: <20160819115215.6585dc3a@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/gpu/index.rst between commit: b754b35b089d ("vgaarbiter: rst-ifiy and polish kerneldoc") from the drm-misc tree and commit: 505f711174b0 ("doc-rst: add index to sub-folders") 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/gpu/index.rst index ba92f45abb76,5ff3d2b236af..000000000000 --- a/Documentation/gpu/index.rst +++ b/Documentation/gpu/index.rst @@@ -12,4 -12,10 +12,11 @@@ Linux GPU Driver Developer's Guid drm-uapi i915 vga-switcheroo + vgaarbiter + + .. only:: subproject + + Indices + ======= + + * :ref:`genindex`