Date: Fri, 25 Dec 2020 09:32:22 -0800 From: Conrad Meyer <cem@freebsd.org> To: Oliver Pinter <oliver.pntr@gmail.com> Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@freebsd.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@freebsd.org> Subject: Re: git: f7cd7fe51c41 - sys/contrib/zstd: Import zstd 1.4.8 Message-ID: <CAG6CVpVt1MvQmu1oPNNGCmvsYkB3u8Tx21pPRTqj_THJf9Kh8Q@mail.gmail.com> In-Reply-To: <CAPjTQNGBcMCQf1ibXscdAwnL6hBLQyhXcnGVO3QhXqVaOTkX7Q@mail.gmail.com> References: <202012251556.0BPFu9l7029902@gitrepo.freebsd.org> <CAPjTQNGBcMCQf1ibXscdAwnL6hBLQyhXcnGVO3QhXqVaOTkX7Q@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Dec 25, 2020 at 8:58 AM Oliver Pinter <oliver.pntr@gmail.com> wrote: > On Friday, December 25, 2020, Conrad Meyer <cem@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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAG6CVpVt1MvQmu1oPNNGCmvsYkB3u8Tx21pPRTqj_THJf9Kh8Q>