MFC changes for stable/11 error

[Ed Maste]

On Thu, 31 Dec 2020 at 13:10, MR <mr at freebsd.org> wrote:
>
> error: could not apply a70af2507f72... MFC r340361, r345804: catch up
> on systat in head/
> hint: after resolving the conflicts, mark the corrected paths
> hint: with 'git add <paths>' or 'git rm <paths>'
> hint: and commit the result with 'git commit'

This is presumably just because there are additional changes that were
merged to stable/12 and not stable/11.

kevans' "MFC -fno-common fixes" commit is:

stable/11 e9ba4c1e146d1ebf889b73a78878807c8bc3f0cb
stable/12 9a042535a9eb5ea8dd1b3e0d80483d02f1cba951

as you mentioned this is the most recent usr.bin/systat commit in
stable/11, while there are three additional changes in stable/12 in
usr.bin/systat after that one. But if we compare usr.bin/systat at
those two hashes we see:

$ git diff --stat e9ba4c1e146d1ebf889b73a78878807c8bc3f0cb
9a042535a9eb5ea8dd1b3e0d80483d02f1cba951 usr.bin/systat
 usr.bin/systat/Makefile        |   2 +-
 usr.bin/systat/Makefile.depend |   1 -
 usr.bin/systat/cmds.c          |   4 +++-
...
 25 files changed, 234 insertions(+), 152 deletions(-)

So the failure from `git cherry-pick -x` is just a patch conflict, the
same as would occur trying to merge those three commits in SVN.

$ git cherry-pick -x a70af2507f720c2d7f56f51a18d358123b4770a5
...
error: could not apply a70af2507f72... MFC r340361, r345804: catch up
on systat in head/
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

As with svn you can edit the conflicting files and then commit the
result - or, cherry-pick the other changes that are missing from
stable/11 if appropriate.

It seems two files conflicted:
usr.bin/systat/vmstat.c
usr.bin/systat/zarc.c
the conflict in the former can be resolved automatically; for zarc.c
you can check what's merged to stable/12:

% git log ..freebsd/stable/12 usr.bin/systat/zarc.c

Looking through the commits it seems at least
45e9405ea4b05926b22a743237cbfe918206db50 was not merged and is
responsible for at least one of the conflicts.