Em Wed, Jul 09, 2014 at 04:09:21PM -0300, Arnaldo Carvalho de Melo escreveu:
> Em Wed, Jul 09, 2014 at 04:16:33PM +0200, Joseph Schuchart escreveu:
> > 
> >  perf script: Add callchain to generic and tracepoint events.  Since
> >  this alters the interface for the python scripts, also adjust the script 
> >  generation and the provided scripts.
> > 
> > Signed-off-by: Joseph Schuchart <joseph.schuch...@tu-dresden.de>
> > Acked-by: Thomas Ilsche <thomas.ils...@tu-dresden.de>
> 
> This one is not applying, I'm checking the reason for its malformation
> as stated in:
> 
> 
> [acme@ssdandy linux]$ patch -p1 < /wb/1.patch 
> patching file tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py
> Hunk #1 FAILED at 107.
> 1 out of 1 hunk FAILED -- saving rejects to file 
> tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py.rej
> patching file tools/perf/scripts/python/check-perf-trace.py
> Hunk #1 succeeded at 27 with fuzz 1.
> Hunk #2 succeeded at 37 with fuzz 2 (offset -1 lines).
> patching file tools/perf/scripts/python/failed-syscalls-by-pid.py
> Hunk #1 FAILED at 39.
> 1 out of 1 hunk FAILED -- saving rejects to file 
> tools/perf/scripts/python/failed-syscalls-by-pid.py.rej
> patching file tools/perf/scripts/python/futex-contention.py
> patch: **** malformed patch at line 154: ain,

It is full of:

                self.cpu =3D common_cpu
                self.secs =3D common_secs
                self.nsecs =3D common_nsecs
                self.pid =3D common_pid
                self.comm =3D common_comm
+               self.callchain =3D common_callchain
=20
        def ts(self):


See those =20, =3D? Some encoding problem...

So you used:

User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 
Thunderbird/24.2.0

Please read the Thunderbird specific part of this page:

https://www.kernel.org/pub/software/scm/git/docs/git-format-patch.html

- Arnaldo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to