From owner-dev-commits-src-all@freebsd.org Fri Dec 25 17:32:36 2020 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8EFF64C6E1D; Fri, 25 Dec 2020 17:32:36 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D2YtC5q0wz3j5h; Fri, 25 Dec 2020 17:32:35 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-oi1-f179.google.com with SMTP id l200so5247463oig.9; Fri, 25 Dec 2020 09:32:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:reply-to :from:date:message-id:subject:to:cc; bh=cxGwa1u2tgsgWEkywRsX2jVtIMhvLJXIo9/UOOWO3GE=; b=JBjH5c/rdOKpq+7VZcPTQK7Y75fXKo6IRVEiDw95Qo/k9VOiMUaUPHyXR95SHAiFWu jMDQNTZHDzyAsWZSBI9vBjGf/Twcb0HQdz/Gmq7iwNMiDQ7HkFUFQYlP2lfaGBonRtSR qoW2J/k17CbAkrojff17rwgVn76jMuWVkDWJL8/w2NabLIg/HngTFo1uYA6TWADBKp+O DNDmwpLPukp6U6IVJljxI1zf4hzXTPPnhBWEDurqOd/fRTF9/aAjIF8dBl/SDw/fylLh SR9PRyzkPhKZoN4TQ8G3nTNLIjswX0mT4hiKzEp7kmMq8tvDW6enl/hqzaA0w1sPOn2M gkPA== X-Gm-Message-State: AOAM5318y1ZAkSWuZLrxay54yn0+ZQumjF+rT1Y8Ya/1HZpGkRKaFu5Z bZcYgO1Er/ocPjLRIo+go4ZCvWBJOdY= X-Google-Smtp-Source: ABdhPJzGfn3TspCiadh7IkJpKZV0jb4+eELhYGC2tp0bcgWNy81wqyB4ykWT/NniTln6l/koGKGWVg== X-Received: by 2002:aca:438b:: with SMTP id q133mr5984794oia.50.1608917554808; Fri, 25 Dec 2020 09:32:34 -0800 (PST) Received: from mail-ot1-f48.google.com (mail-ot1-f48.google.com. [209.85.210.48]) by smtp.gmail.com with ESMTPSA id j11sm7688066oos.47.2020.12.25.09.32.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 25 Dec 2020 09:32:34 -0800 (PST) Received: by mail-ot1-f48.google.com with SMTP id d20so4207912otl.3; Fri, 25 Dec 2020 09:32:34 -0800 (PST) X-Received: by 2002:a9d:37c4:: with SMTP id x62mr26697623otb.87.1608917554572; Fri, 25 Dec 2020 09:32:34 -0800 (PST) MIME-Version: 1.0 References: <202012251556.0BPFu9l7029902@gitrepo.freebsd.org> In-Reply-To: Reply-To: cem@freebsd.org From: Conrad Meyer Date: Fri, 25 Dec 2020 09:32:22 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: f7cd7fe51c41 - sys/contrib/zstd: Import zstd 1.4.8 To: Oliver Pinter Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4D2YtC5q0wz3j5h X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of csecem@gmail.com designates 209.85.167.179 as permitted sender) smtp.mailfrom=csecem@gmail.com X-Spamd-Result: default: False [-0.61 / 15.00]; HAS_REPLYTO(0.00)[cem@freebsd.org]; TO_DN_EQ_ADDR_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; REPLYTO_ADDR_EQ_FROM(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; FREEMAIL_TO(0.00)[gmail.com]; FORGED_SENDER(0.30)[cem@freebsd.org,csecem@gmail.com]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; R_DKIM_NA(0.00)[]; TAGGED_FROM(0.00)[]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.167.179:from]; FROM_NEQ_ENVFROM(0.00)[cem@freebsd.org,csecem@gmail.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_MEDIUM(-0.61)[-0.611]; NEURAL_HAM_LONG(-1.00)[-1.000]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; NEURAL_SPAM_SHORT(1.00)[1.000]; SPAMHAUS_ZRD(0.00)[209.85.167.179:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.167.179:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.167.179:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[dev-commits-src-all,dev-commits-src-main] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Commit messages for all branches of the src repository." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Dec 2020 17:32:36 -0000 On Fri, Dec 25, 2020 at 8:58 AM Oliver Pinter wrote: > On Friday, December 25, 2020, Conrad Meyer 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