From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1753715AbcHVG5q (ORCPT <rfc822;w@1wt.eu>);
        Mon, 22 Aug 2016 02:57:46 -0400
Received: from mail-wm0-f53.google.com ([74.125.82.53]:38158 "EHLO
        mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1752226AbcHVG5o (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 22 Aug 2016 02:57:44 -0400
Date: Mon, 22 Aug 2016 08:56:54 +0200
From: Daniel Vetter <daniel@ffwll.ch>
To: Jonathan Corbet <corbet@lwn.net>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
        Daniel Vetter <daniel.vetter@ffwll.ch>,
        Intel Graphics <intel-gfx@lists.freedesktop.org>,
        DRI <dri-devel@lists.freedesktop.org>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        Markus Heiser <markus.heiser@darmarIT.de>
Subject: Re: linux-next: manual merge of the jc_docs tree with the drm-misc
 tree
Message-ID: <20160822065654.GY6232@phenom.ffwll.local>
Mail-Followup-To: Jonathan Corbet <corbet@lwn.net>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Intel Graphics <intel-gfx@lists.freedesktop.org>,
        DRI <dri-devel@lists.freedesktop.org>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        Markus Heiser <markus.heiser@darmarIT.de>
References: <20160819115215.6585dc3a@canb.auug.org.au>
 <20160819115009.354453a6@lwn.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20160819115009.354453a6@lwn.net>
X-Operating-System: Linux phenom 4.6.0-1-amd64 
User-Agent: Mutt/1.6.0 (2016-04-01)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, Aug 19, 2016 at 11:50:09AM -0600, Jonathan Corbet wrote:
> On Fri, 19 Aug 2016 11:52:15 +1000
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > 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.
> 
> Thanks, the fix is good.
> 
> Daniel: my apologies, I should have asked for that patch to be split up
> and the relevant pieces sent through the gpu and media trees.

No worries, as far as conflicts go this one is trivial ;-) And I think a
few conflicts while we shake out best practices for the new doc
infrastructure in various trees is perfectly fine.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch