Re: [PATCH v3 0/7] extend branch tracing to use ARM CoreSight traces

[Simon Marchi <simon.marchi@polymtl.ca>]

On 2021-04-05 3:38 a.m., Zied Guermazi wrote:
> hi Simon,
> 
> the first error message looks related to the change log.

Yeah, this:

     /home/simark/src/binutils-gdb/.git/worktrees/avr/rebase-apply/patch:394: trailing whitespace.
             * btrace-common.h (btrace_format): add BTRACE_FORMAT_ETM 

This is just a warning (which should be addressed, removing the
offending trailing whitespace).  But this isn't the main issue, this is:

     error: patch failed: gdb/record-btrace.c:2950
     error: gdb/record-btrace.c: patch does not apply
     error: patch failed: gdbsupport/btrace-common.cc:36
     error: gdbsupport/btrace-common.cc: patch does not apply
     error: Did you hand edit your patch? 

The hunks for the source files don't apply.  Did you send your patch
using git-send-email?

> I am adding the change logs manually to the mail, is this fine? how shall the change logs be provided? shall I change the ChangeLog files located under gdb, gdbserver and gdbsupport folder? is it enough to put the change logs in the mail header?

Most people put the ChangeLog entries only in the commit message when
sending the patch for review, and only move them to the actual ChangeLog
files when pushing.  This is a habit to avoid unnecessary conflicts in
ChangeLog files, where the top lines change all the time (this can also
be mitigated using git-merge-changelog).

But since you gave me the exact commit, on which to apply the series,
it should work regardless.  So the patch's formatting has likely been
altered in the process of sending it.

Simon