[PATCH v2 0/1] apple-gmux: Add initial documentation

Darren Hart dvhart at infradead.org
Mon Jan 11 09:45:25 PST 2016


On Mon, Jan 11, 2016 at 08:03:18AM +0100, Daniel Vetter wrote:
> On Mon, Jan 11, 2016 at 12:08:35AM +0100, Lukas Wunner wrote:
> > On Fri, Jan 08, 2016 at 09:49:22AM -0700, Jonathan Corbet wrote:
> > > Well, it's built around the asciidoc patch, which isn't in the mainline
> > > at this point.  Should things go a different direction, that could force
> > > some changes here;
> > 
> > If/when that happens, I'll be happy to fixup the documentation as needed.
> > In fact I originally wrote this in markdown in November, then converted
> > it to asciidoc in December and that really wasn't a big deal.
> > 
> > The need for asciidoc arises from the desire to not clutter up the prose
> > text with URLs. To achieve this, asciidoc allows defining so-called
> > "attribute entries" which may then be referenced in the text:
> > http://asciidoc.org/userguide.html#X62
> > 
> > Markdown has a similar feature called "reference style links", the
> > difference being that they can be defined anywhere in the document,
> > whereas asciidoc's "attribute entries" must precede their usage in
> > the text:
> > https://daringfireball.net/projects/markdown/syntax#link
> > 
> > 
> > Here's a v2, the only change is Bruno Pr?mont's addition to the commit
> > message.
> > 
> > @Daniel Vetter: Could you pick this up for topic/drm-misc please?
> 
> I think it makes more sense to pull this in through Darren's tree, and I
> acked that on the last round already.

OK, I'm happy to take it. Lukas, this doesn't apply cleanly to my 4.4-rc* based
for-next branch or Linus's 4.4 from yesterday. I can manually apply it:

$ patch -p1 < ~/incoming/PATCH_v2_1-1_apple-gmux_Add_initial_documentation.mbox 
patching file Documentation/DocBook/gpu.tmpl
Hunk #1 succeeded at 4279 with fuzz 1 (offset 809 lines).
patching file drivers/platform/x86/apple-gmux.c

But that is one hell of an offset. What are you developing against and can you
send me something that applies cleanly?

-- 
Darren Hart
Intel Open Source Technology Center


More information about the dri-devel mailing list