From: Darren Hart <dvhart@infradead.org>
To: Daniel Vetter <daniel@ffwll.ch>
Cc: Lukas Wunner <lukas@wunner.de>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Jonathan Corbet <corbet@lwn.net>,
Darren Hart <dvhart@linux.intel.com>,
dri-devel@lists.freedesktop.org,
platform-driver-x86@vger.kernel.org,
Bruno Premont <bonbons@linux-vserver.org>
Subject: Re: [PATCH v2 0/1] apple-gmux: Add initial documentation
Date: Mon, 11 Jan 2016 09:45:25 -0800 [thread overview]
Message-ID: <20160111174525.GA1813@malice.jf.intel.com> (raw)
In-Reply-To: <20160111070318.GC8076@phenom.ffwll.local>
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
next prev parent reply other threads:[~2016-01-11 17:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-10 23:08 [PATCH v2 0/1] apple-gmux: Add initial documentation Lukas Wunner
2016-01-10 23:08 ` [PATCH v2 1/1] " Lukas Wunner
2016-01-11 7:03 ` [PATCH v2 0/1] " Daniel Vetter
2016-01-11 13:07 ` Lukas Wunner
2016-01-11 14:57 ` Daniel Vetter
2016-01-11 17:45 ` Darren Hart [this message]
2016-01-11 19:19 ` Lukas Wunner
2016-01-11 19:26 ` Darren Hart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160111174525.GA1813@malice.jf.intel.com \
--to=dvhart@infradead.org \
--cc=bonbons@linux-vserver.org \
--cc=corbet@lwn.net \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=dvhart@linux.intel.com \
--cc=lukas@wunner.de \
--cc=platform-driver-x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox