From: Stefan Richter <stefanr@s5r6.in-berlin.de>
To: Stefan Richter <stefanr@s5r6.in-berlin.de>
Cc: Rob Landley <rob@landley.net>, Lubomir Rintel <lkundrak@v3.sk>,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
"Justin P. Mattock" <justinmattock@gmail.com>,
Bernhard Kaindl <bk@suse.de>,
linux1394-devel@lists.sourceforge.net,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [PATCH] docs: Update FireWire debugging documentation
Date: Sun, 12 Jan 2014 19:04:45 +0100 [thread overview]
Message-ID: <20140112190445.7a7ad792@stein> (raw)
In-Reply-To: <20131223161819.20613590@stein>
On Dec 23 Stefan Richter wrote:
> CC'ing linux1394-devel, quoting in full.
(forgot to Cc akpm, who pointed me to the patch in the first place.)
> On Dec 22 Lubomir Rintel wrote:
> > The old firewire stack is long dead now and a new version firescope has been
> > released with support for current kernels.
> >
> > Cc: Rob Landley <rob@landley.net>
> > Cc: Justin P. Mattock <justinmattock@gmail.com>
> > Cc: Bernhard Kaindl <bk@suse.de>
> > Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
>
> Reviewed-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
>
> > ---
> > Documentation/debugging-via-ohci1394.txt | 24 +++++++++---------------
> > Documentation/power/basic-pm-debugging.txt | 2 +-
> > 2 files changed, 10 insertions(+), 16 deletions(-)
>
> Rob, will you be taking this or should it go into linux1394.git?
>
> Lubomir sent another patch for linux1394.git which among else also touches
> Documentation/debugging-via-ohci1394.txt, but git's default merge strategy
> handles this overlap automatically and correctly. I.e. this can go
> separate ways to upstream.
> (http://marc.info/?l=linux1394-devel&m=138770970409985,
> "[PATCH] ohci: Turn remote DMA support into a module parameter")
Meanwhile, Andrew put the patch into -mm. Given that linux1394.git is a
little bit more on-topic for this, and now that I committed the mentioned
related firewire-ohci patch, I copied the Documentation patch from -mm into
linux1394.git (and Andrew will drop it automatically AFAIK).
--
Stefan Richter
-=====-====- ---= -==--
http://arcgraph.de/sr/
prev parent reply other threads:[~2014-01-12 18:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-22 10:31 [PATCH] docs: Update FireWire debugging documentation Lubomir Rintel
2013-12-23 15:18 ` Stefan Richter
2014-01-12 18:04 ` Stefan Richter [this message]
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=20140112190445.7a7ad792@stein \
--to=stefanr@s5r6.in-berlin.de \
--cc=akpm@linux-foundation.org \
--cc=bk@suse.de \
--cc=justinmattock@gmail.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux1394-devel@lists.sourceforge.net \
--cc=lkundrak@v3.sk \
--cc=rob@landley.net \
/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