From owner-svn-src-all@freebsd.org Wed Nov 4 21:33:44 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 6D25A466C7C; Wed, 4 Nov 2020 21:33:44 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) (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 4CRKf00pFlz4Jj6; Wed, 4 Nov 2020 21:33:43 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: by mail-wm1-x335.google.com with SMTP id c9so3770993wml.5; Wed, 04 Nov 2020 13:33:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=HOb+xZfVnnx3ILax4hFFOCnudX+rKhmroMYbNlQSg4s=; b=iezW1HBnYdhq0VuuvAXSnoNRJldBgBIjUv72RXGIHNPfNTKKpM+lDY8Jd589AAkoi9 vvJKakS24pjTDPTRi04HMWxK/TDZxOwO3FaJhFtQxEiKa8pPVsgRiFPvuY7Bj4jZ3ITX Pg47MZWo/wNjipNradA3L053vtCUw+tvFnXoEYTwGYgsmRShMli/xwXejxr34EwvxE1c mimKtRxrGitnAjHnZaBdKd+9PRcJqcHeSdqIpz7172ZNsowa1kV9RlRPK6VoaAEoV0rY wmIfat8O2mUDpMVxpvYOGwazCzwT/yMStckzSmMf7sQR9Ecde5ZI8nLbx5qKqYNrFsRa R1Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=HOb+xZfVnnx3ILax4hFFOCnudX+rKhmroMYbNlQSg4s=; b=s8h5kTOc+5H84BYvc13J0DEoMl9zneZ+aLkYEYdTrOSKMlYkgYCukiOjqgWJYY82i5 Xek6f1be+8WBJezg/NZNG2CKN+qGVcrHvuC/Hyf2n7CrM1YmYE+Ln690D8BojtLw3Bdi H7CmabuCuCmXf/4pTqBXiYfbuFVTLlTwvs1+uw4EyzzjNIRP73oknVU+W5AnwjZjjkAn xojDfg2Omo+tri7brIr/ReXw/KY8Fecz31ZeCr9E1xww2+O8LDvkgEpFzFpG19BrXQ38 hh48h8WhDCBH6wjWnPDP/KEBZ3SauFlmVgsbVlzLIvm+rScXz+HGrVkiOiSS4wZcLdqw 2Mgg== X-Gm-Message-State: AOAM530roJUxu2gys5jnfHVq+xhtpNvqvbHh1PloDgdivF1GhU6sHDu+ F7fzCG7riv/HH+DzUYDzbAXBCXhttkBFxBf0KS6YytawtJ8= X-Google-Smtp-Source: ABdhPJzC+98ZabSq86DaNOn6C1ym6cjNleFEVnu2+1UeW4z9/slwXi1BkpNsRG+f/S+8zcmJKovOkRGdADDBXQHMMlA= X-Received: by 2002:a1c:e442:: with SMTP id b63mr504051wmh.10.1604525621466; Wed, 04 Nov 2020 13:33:41 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a5d:4c4f:0:0:0:0:0 with HTTP; Wed, 4 Nov 2020 13:33:40 -0800 (PST) In-Reply-To: <4cecdc18-e9e9-4319-2502-e8c69a94aba5@FreeBSD.org> References: <202011042118.0A4LIq3H077210@repo.freebsd.org> <4cecdc18-e9e9-4319-2502-e8c69a94aba5@FreeBSD.org> From: Mateusz Guzik Date: Wed, 4 Nov 2020 22:33:40 +0100 Message-ID: Subject: Re: svn commit: r367343 - in head/sys/contrib/openzfs/include/os: freebsd/zfs/sys linux/zfs/sys To: Andriy Gapon Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org, Matt Macy Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4CRKf00pFlz4Jj6 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] 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 21:33:44 -0000 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. 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 > -- Mateusz Guzik