git: f7cd7fe51c41 - sys/contrib/zstd: Import zstd 1.4.8

[Conrad Meyer]

On Fri, Dec 25, 2020 at 8:58 AM Oliver Pinter <oliver.pntr at gmail.com> wrote:
> On Friday, December 25, 2020, Conrad Meyer <cem at freebsd.org> wrote:
>>
>> The branch main has been updated by cem:
>>
>> URL: https://cgit.FreeBSD.org/src/commit/?id=f7cd7fe51c4140960ebea00410ed62894f5625d1
>>
>> commit f7cd7fe51c4140960ebea00410ed62894f5625d1
>> ...
>>
>>     Conflicts:
>>             sys/contrib/zstd/lib/common/zstd_internal.h (new ZSTD_NO_INTRINSICS)
>
>
> Next time it would be nice to rebase to the most recent master. With the rebase, you could avoid the merge conflicts.

Hi Oliver,

I believe you are wholly mistaken.  The conflict has nothing do with
an old master (and in fact, the merge was done on the then-current
'main' branch).  The conflict is between local FreeBSD modifications
to the sys/contrib code (r361427) that were never present in upstream
zstd.  Those changes conflicted because upstream introduced a similar
mechanism with a different spelling in the same location.  In the
merge conflict resolution, we dropped our version of the change and
added -DZSTD_NO_INTRINSICS to the kernel zstd build (kern.pre.mk
ZSTD_C).

Conrad