From owner-dev-commits-src-all@freebsd.org  Fri Jan  8 04:16:07 2021
Return-Path: <owner-dev-commits-src-all@freebsd.org>
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 409AC4E5C95;
 Fri,  8 Jan 2021 04:16:07 +0000 (UTC)
 (envelope-from tmunro@freebsd.org)
Received: from smtp.freebsd.org (smtp.freebsd.org
 [IPv6:2610:1c1:1:606c::24b:4])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "smtp.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4DBqXl1BtRz4rmS;
 Fri,  8 Jan 2021 04:16:07 +0000 (UTC)
 (envelope-from tmunro@freebsd.org)
Received: from mail-io1-f50.google.com (mail-io1-f50.google.com
 [209.85.166.50])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK))
 (Authenticated sender: tmunro/mail)
 by smtp.freebsd.org (Postfix) with ESMTPSA id 1735D2C590;
 Fri,  8 Jan 2021 04:16:07 +0000 (UTC)
 (envelope-from tmunro@freebsd.org)
Received: by mail-io1-f50.google.com with SMTP id n4so8488895iow.12;
 Thu, 07 Jan 2021 20:16:07 -0800 (PST)
X-Gm-Message-State: AOAM532Czl9w23251lT8sJe0b9Vcr2i05YMDpezp6zK3L9HczGev4fpa
 TWrvdpL/atsYT/W3hXXIlx7qaEDSqVl1+rcLj5w=
X-Google-Smtp-Source: ABdhPJxbyKtlw30M7JQfUPXjAuBmoc+id/HpyZS8Wcfp9HXiAxU6v0AsUeso0yDmZ7Q3p2NONg8F7Oxf9aw6KrzkeF4=
X-Received: by 2002:a5d:824b:: with SMTP id n11mr3960832ioo.27.1610079366346; 
 Thu, 07 Jan 2021 20:16:06 -0800 (PST)
MIME-Version: 1.0
References: <202101080016.1080Gwu5034111@gitrepo.freebsd.org>
 <CACNAnaFV=_x9PdV6TD65e8LNfeMqNRX1UnxEA7VN7LLj8XUoAg@mail.gmail.com>
In-Reply-To: <CACNAnaFV=_x9PdV6TD65e8LNfeMqNRX1UnxEA7VN7LLj8XUoAg@mail.gmail.com>
From: Thomas Munro <tmunro@freebsd.org>
Date: Fri, 8 Jan 2021 17:15:30 +1300
X-Gmail-Original-Message-ID: <CA+hUKGL2atmOOn0h80-5yGuhKj3-t2cAvKeUgdwOTAWO64vjZw@mail.gmail.com>
Message-ID: <CA+hUKGL2atmOOn0h80-5yGuhKj3-t2cAvKeUgdwOTAWO64vjZw@mail.gmail.com>
Subject: Re: git: a5e284038edc - main - open(2): Add O_DSYNC flag.
To: Kyle Evans <kevans@freebsd.org>
Cc: src-committers <src-committers@freebsd.org>,
 dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org
Content-Type: text/plain; charset="UTF-8"
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
 <dev-commits-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-all>, 
 <mailto:dev-commits-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-all/>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Help: <mailto:dev-commits-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all>, 
 <mailto:dev-commits-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Jan 2021 04:16:07 -0000

On Fri, Jan 8, 2021 at 4:54 PM Kyle Evans <kevans@freebsd.org> wrote:
> On Thu, Jan 7, 2021 at 6:17 PM Thomas Munro <tmunro@freebsd.org> wrote:
> > +#define        O_DSYNC         0x00800000      /* POSIX data sync */

> I think the value of O_DSYNC got resolved incorrectly in a merge
> conflict; O_RESOLVE_BENEATH in the just prior __BSD_VISIBLE block took
> 0x00800000, so I believe this should be 0x01000000.

Right, that's exactly what happened.  Will fix.  Thanks!