On 14/10/2020 12:16, Jiri Olsa wrote:
My thought was that since the kernel part needs acceptance first [0], which
is based on v5.9-rc7, I would just use the same baseline here.
However I suppose I should still use Arnaldo's perf/core from now on as
baseline, so I'll look at that now.
yes please, I can't already apply 2nd patch..
patching file pmu-events/jevents.c
Hunk #1 succeeded at 82 with fuzz 2 (offset 29 lines).
Hunk #2 FAILED at 335.
Hunk #3 FAILED at 354.
Hunk #4 succeeded at 406 (offset 22 lines).
Hunk #5 FAILED at 439.
Hunk #6 FAILED at 531.
Hunk #7 FAILED at 555.
Hunk #8 FAILED at 602.
Hunk #9 FAILED at 698.
Hunk #10 succeeded at 770 (offset 2 lines).
Hunk #11 succeeded at 813 (offset 2 lines).
Hunk #12 succeeded at 1075 (offset 2 lines).
Hunk #13 succeeded at 1242 (offset 2 lines).
Hunk #14 succeeded at 1273 (offset 2 lines).
7 out of 14 hunks FAILED -- saving rejects to file
pmu-events/jevents.c.rej
can't find file to patch at input line 439
OK, so I already did the rebase and it was quite straightforward - the
conflicts came with the recent changes in jevents.
I will send out soon.
Thanks,
John
