From owner-svn-src-all@freebsd.org Wed Nov 4 22:28:16 2020 Return-Path: Delivered-To: svn-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 EFAB8468398 for ; Wed, 4 Nov 2020 22:28:16 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: from mail-yb1-xb2f.google.com (mail-yb1-xb2f.google.com [IPv6:2607:f8b0:4864:20::b2f]) (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 4CRLrw1nSYz4MmK for ; Wed, 4 Nov 2020 22:28:15 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: by mail-yb1-xb2f.google.com with SMTP id i186so217341ybc.11 for ; Wed, 04 Nov 2020 14:28:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kev009.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=0ksePu1R9hTXEooJSsXNHZl0GM617bRzu2zxzEQlfmg=; b=WQQj9k7CSLIO+WJdW5iKQ5AiSuzgh/9wN/eW1RJSIZdWFLN8Sox6T8tE26zsvcUyPI +gJqW8IHNDjK4ELS10hiW//KZBYwRB6M89ftBwgiyMm7D/Lifp8mj+0W5Vu7Y92eQZ0V 89s/sR1MfI+v5NWZ5Wv2scKSERDQvkcfbUIXg= 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:from:date :message-id:subject:to:cc; bh=0ksePu1R9hTXEooJSsXNHZl0GM617bRzu2zxzEQlfmg=; b=H4sLwJD32Tb0Y0YBxMQjR1QT1OSUzF6X2QFSHpzJLZPg23QFzL/UZcZCFrWEK+HVpJ gFpIBvyHyGoTP+UxQ9eNkqV/iqr9MkJXIT4b4/dQpV5id2lgUYx90+JlwzDCKjHVma8r FUMJZXFvjj1Kt65g2WUJv7E7GxJr2Ei72YU88mKmbfS6A1LilJ0TbotXFiUeRV3sayC1 9jzGAl1buL2Y0Tyv2D8RpArrns+tm0KYsOtPvjGTDryemikpJpshmTZG0YxCQNR8w8ge zvDgoj+DO5cq8aPeHYrGd6IetzKl67joGurDpbVWxhbQPALosGxKjXslfomf/ikuzWqr z7+w== X-Gm-Message-State: AOAM531kZ4eWVNt511e8u+aryqLVZhrY433Y8xWJc4dhoPcu88Szy8+B iJeNDAaaHPnzBfD9MUUMR0T+tTxinpgzA3w8gULkCQ== X-Google-Smtp-Source: ABdhPJxMprbYXtHG3/0IwI1tLnrxuQhHJn0n3zHXAckuQ7YyETqqbeFbvRKt0asuyni5944OJlHxKKy1Xmw3P2w1gao= X-Received: by 2002:a25:41c2:: with SMTP id o185mr4624016yba.391.1604528894801; Wed, 04 Nov 2020 14:28:14 -0800 (PST) MIME-Version: 1.0 References: <202011042118.0A4LIq3H077210@repo.freebsd.org> <4cecdc18-e9e9-4319-2502-e8c69a94aba5@FreeBSD.org> <68c25132-2d3b-5028-dc6a-db5f252842d7@FreeBSD.org> In-Reply-To: <68c25132-2d3b-5028-dc6a-db5f252842d7@FreeBSD.org> From: Kevin Bowling Date: Wed, 4 Nov 2020 15:28:03 -0700 Message-ID: Subject: Re: svn commit: r367343 - in head/sys/contrib/openzfs/include/os: freebsd/zfs/sys linux/zfs/sys To: Andriy Gapon Cc: Mateusz Guzik , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org, Matt Macy Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4CRLrw1nSYz4MmK X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none (invalid DKIM record) header.d=kev009.com header.s=google header.b=WQQj9k7C; dmarc=none; spf=pass (mx1.freebsd.org: domain of kevin.bowling@kev009.com designates 2607:f8b0:4864:20::b2f as permitted sender) smtp.mailfrom=kevin.bowling@kev009.com X-Spamd-Result: default: False [-2.17 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.005]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; NEURAL_HAM_LONG(-1.04)[-1.041]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[kev009.com]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_SPAM_SHORT(0.17)[0.172]; DKIM_TRACE(0.00)[kev009.com:~]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::b2f:from]; R_DKIM_PERMFAIL(0.00)[kev009.com:s=google]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FREEMAIL_CC(0.00)[gmail.com,freebsd.org]; MAILMAN_DEST(0.00)[svn-src-all]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Nov 2020 22:28:17 -0000 This doesn't answer all of your questions but one important thing to point out is that Mateusz is in communication with the OpenZFS and iX folks to coordinate these changes and avoid expected merge conflicts. The idealized workflow is that a change goes into OZFS first, but as long as folks are in agreement that can be expedited. Once src is on git, it is expected this type of cherry-pick in both directions will be easier to formally define. Regards, Kevin On Wed, Nov 4, 2020 at 2:36 PM Andriy Gapon wrote: > > On 04/11/2020 23:33, Mateusz Guzik wrote: > > Well, should you check OpenZFS github you will find I post pull > > request there as well. So whatever conflicts arise for people merging > > stuff back are to be just whacked in favor in what's in upstream. > > I certainly would, but how would I know that I should? > Any cross-reference would be of help both now and for the future code history > archaeology. > > > On 11/4/20, Andriy Gapon wrote: > >> On 04/11/2020 23:18, Mateusz Guzik wrote: > >>> Author: mjg > >>> Date: Wed Nov 4 21:18:51 2020 > >>> New Revision: 367343 > >>> URL: https://svnweb.freebsd.org/changeset/base/367343 > >>> > >>> Log: > >>> zfs: add branch prediction to ZFS_ENTER and ZFS_VERIFY_ZP macros > >>> > >>> They are expected to fail only in corner cases. > >>> > >>> Modified: > >>> head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_znode_impl.h > >>> head/sys/contrib/openzfs/include/os/linux/zfs/sys/zfs_znode_impl.h > >> > >> Picking a random commit of many, is this how we do ZFS/OpenZFS changes now? > >> Can I do the same? > >> Who will be resolving any merge conflicts resulting from my changes? > >> > >> -- > >> Andriy Gapon > >> > > > > > > > -- > Andriy Gapon > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org"