From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonathan Corbet Subject: Re: [PATCH 1/5] dma-buf: Extract dma-buf.rst Date: Sun, 11 Dec 2016 13:41:40 -0700 Message-ID: <20161211134140.3ecb78ab@lwn.net> References: <20161209185309.1682-1-daniel.vetter@ffwll.ch> <20161209185309.1682-2-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20161209185309.1682-2-daniel.vetter@ffwll.ch> Sender: linux-doc-owner@vger.kernel.org To: Daniel Vetter Cc: DRI Development , Intel Graphics Development , linux-doc@vger.kernel.org, Sumit Semwal , Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org On Fri, 9 Dec 2016 19:53:05 +0100 Daniel Vetter wrote: > Just prep work to polish and consolidate all the dma-buf related > documenation. > > Unfortunately I didn't discover a way to both integrate this new file > into the overall toc while keeping it at the current place. Work > around that by moving it into the overall driver-api/index.rst. OK, I've applied this, with one change: > diff --git a/include/linux/dma-fence.h b/include/linux/dma-fence.h > index d51a7d23c358..c683c4e908d2 100644 > --- a/include/linux/dma-fence.h > +++ b/include/linux/dma-fence.h > @@ -163,7 +163,6 @@ struct dma_fence_cb { > * destruction of the fence. Can be called from irq context. > * If pointer is set to NULL, kfree will get called instead. > */ > - > struct dma_fence_ops { > const char * (*get_driver_name)(struct dma_fence *fence); > const char * (*get_timeline_name)(struct dma_fence *fence); This hunk didn't apply to my tree, but I figured that, under duress, we could probably manage to do without it for now...:) jon