2014-01-12 18:05:09

by Stefan Richter

[permalink] [raw]
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 <[email protected]>
> > Cc: Justin P. Mattock <[email protected]>
> > Cc: Bernhard Kaindl <[email protected]>
> > Signed-off-by: Lubomir Rintel <[email protected]>
>
> Reviewed-by: Stefan Richter <[email protected]>
>
> > ---
> > 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/