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 S1752634AbcFNTYA (ORCPT <rfc822;w@1wt.eu>);
	Tue, 14 Jun 2016 15:24:00 -0400
Received: from tex.lwn.net ([70.33.254.29]:48353 "EHLO vena.lwn.net"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751388AbcFNTX6 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Tue, 14 Jun 2016 15:23:58 -0400
Date: Tue, 14 Jun 2016 13:23:56 -0600
From: Jonathan Corbet <corbet@lwn.net>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Dave Airlie <airlied@gmail.com>, Jani Nikula <jani.nikula@intel.com>,
        Markus Heiser <markus.heiser@darmarit.de>,
        Grant Likely <grant.likely@secretlab.ca>,
        Mauro Carvalho Chehab <mchehab@osg.samsung.com>,
        Keith Packard <keithp@keithp.com>, LKML <linux-kernel@vger.kernel.org>,
        linux-doc@vger.kernel.org, Hans Verkuil <hverkuil@xs4all.nl>
Subject: Re: [PATCH v2 00/38] Documentation/sphinx
Message-ID: <20160614132356.1ea2e1a3@lwn.net>
In-Reply-To: <CAKMK7uEahGLrH1c0gyYE8qyMsWjaN-zVAyK-YdtskoX1OZKWSg@mail.gmail.com>
References: <cover.1465031816.git.jani.nikula@intel.com>
	<20160609135523.1d027a72@lwn.net>
	<CAKMK7uHkNiz_gX38ZC-KupN8EennuJEVDzvJQGx8O-SAg1GBnA@mail.gmail.com>
	<CAPM=9ty9TBiJfmYHSSEaKjLgpWVwMtoou7N+j=5mnjPFx-+sgQ@mail.gmail.com>
	<CAKMK7uEahGLrH1c0gyYE8qyMsWjaN-zVAyK-YdtskoX1OZKWSg@mail.gmail.com>
Organization: LWN.net
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, 14 Jun 2016 10:15:00 +0200
Daniel Vetter <daniel.vetter@ffwll.ch> wrote:

> Hi Jon,
> 
> On Fri, Jun 10, 2016 at 10:41 PM, Dave Airlie <airlied@gmail.com> wrote:
> 
> > It would be best if Jon can give us a known tag that won't get rebased,
> > and will end up in docs-next and drm-next, then we can arranage for docs-next
> > to get merged early and drm-next should be less trouble.
> >
> > I'm happy to merge that stable branch via drm-misc.  
> 
> Ping for tag/pull request. Note that for gpu.tmpl->rst conversion we
> only need what's currently in docs-next - you can merge Jani's
> follow-up series at leasure later on.

docs-next as a whole won't be rebased.  But, in any case, I've added a
sphinx-4.8 tag at the current spot, hope that helps.

I can promise to have my pull request ready at the beginning of the merge
window so there shouldn't be trouble with DRM having to wait on it.

Thanks,

jon