[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20140112190445.7a7ad792@stein>
Date: Sun, 12 Jan 2014 19:04:45 +0100
From: Stefan Richter <stefanr@...6.in-berlin.de>
To: Stefan Richter <stefanr@...6.in-berlin.de>
Cc: Rob Landley <rob@...dley.net>, Lubomir Rintel <lkundrak@...sk>,
linux-doc@...r.kernel.org, linux-kernel@...r.kernel.org,
"Justin P. Mattock" <justinmattock@...il.com>,
Bernhard Kaindl <bk@...e.de>,
linux1394-devel@...ts.sourceforge.net,
Andrew Morton <akpm@...ux-foundation.org>
Subject: Re: [PATCH] docs: Update FireWire debugging documentation
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@...dley.net>
> > Cc: Justin P. Mattock <justinmattock@...il.com>
> > Cc: Bernhard Kaindl <bk@...e.de>
> > Signed-off-by: Lubomir Rintel <lkundrak@...sk>
>
> Reviewed-by: Stefan Richter <stefanr@...6.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/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists