From nobody Fri Jan 20 11:23:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NyxvH6vYKz2v1pM; Fri, 20 Jan 2023 11:23:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NyxvH6RzQz3Mrs; Fri, 20 Jan 2023 11:23:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674213803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tRCrO+maIkGoNLHKVoCImgfrzPbvZv0yOoS3gVNeDRQ=; b=QVveyOeEa/WE9DEFAgejvRSo7a8xLnc+WIFZfvEtG5rF1M4pbZMF1zrMErdI10phaQUvqZ EfL5dt/A53UAPrTGmsEgmYKfMQlPJpjccxh5a24rqKIEv44FmyeLDLnNZeNkB+giKZx2AL WNQOQkzbuosKK+9T7lq73a6prcEvRI+oCJkQ85trsI4aXn5IpB8Gu4eJajzM5fhyZOX76F Ik3j+P3bhz+rgaBAomkPFyvZeR9s5IZL5syOGg48F1BBMKjQ396bKzvrB0CAgu1EYkem0c KsYCmvgVGDFGZ9cjZlAGYivAmcqE8RqZVl+qGEgpcEnfVH4ciJ1qVKzcbOol4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674213803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tRCrO+maIkGoNLHKVoCImgfrzPbvZv0yOoS3gVNeDRQ=; b=dfN6EhuHv6pQHzXC6cS4gxJYzJ0Z/rYAu5i11x+VAOjPp/Zaa3i6a8mA4japfPbALNRFJ+ KI2ZoiTIgJncnxTEb3baugKR/Ebww+oiKRJs1ugYeqimebViZh3bl3QaDQTo/07BLsVdxT xvmoZBXGjZbPdF8U2Z5OP1W3LQT45TJ1az7TynrEmHABD6Im5S88o5PhK4tfbVAqD/kotr nnC2YameNzVnAYjzTTNZJ+6zLzA4CQY3RWaTT2aTQMCMJurzdy1+IMMwQkemVlNZWrUFGc gSN4LZ8Q7GDw45zJTvf43VtE4c7drDVICvnOkK+R901ZU8wKZO9qg9gFocSh+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674213803; a=rsa-sha256; cv=none; b=T+UhFX2f/MVQ0xpv1EZWd0DH1AXXx5jPqTMGmIAJLg63mpRTxyTVjBKNzmd3p/BEeHqDBm uP+DHnliHf9FsPwaqGQ2IvbSui5XahLWVFjhjf6haIR9HgFSYgM4fwINwbTLz4D86iwbOF nEL44we9APoDFkyGLsLTY7wSt4POc0gp7J3Dn/R0A4JMZIENw6mykkxGOlogfG2Li51tli nnV1wkPwGxKb5PA82U82ll53jofH7vBkfHMbGSlBHrFmnrVsum0g45EFolJXKR6KCB9hqd 5Qdma2ipPTs2jw3G6bPilqaQk6N6mK0XccIO946Unmo1zU9hMFs48LZsWvG/WQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NyxvH5VPkzTLY; Fri, 20 Jan 2023 11:23:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30KBNNr8028074; Fri, 20 Jan 2023 11:23:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30KBNNcW028073; Fri, 20 Jan 2023 11:23:23 GMT (envelope-from git) Date: Fri, 20 Jan 2023 11:23:23 GMT Message-Id: <202301201123.30KBNNcW028073@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1852ca25dd2e - stable/13 - Remove merge conflict leftovers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1852ca25dd2e8862e1f84c45a1140d1c508d0f59 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1852ca25dd2e8862e1f84c45a1140d1c508d0f59 commit 1852ca25dd2e8862e1f84c45a1140d1c508d0f59 Author: Konstantin Belousov AuthorDate: 2023-01-20 11:21:08 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-20 11:22:57 +0000 Remove merge conflict leftovers This is a direct commit to stable/13. Reported by: Stefan Grundmann via https://github.com/freebsd/freebsd-src/pull/639 --- tests/sys/posixshm/posixshm_test.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/sys/posixshm/posixshm_test.c b/tests/sys/posixshm/posixshm_test.c index a7b2e19f38af..9d5832999b9d 100644 --- a/tests/sys/posixshm/posixshm_test.c +++ b/tests/sys/posixshm/posixshm_test.c @@ -1781,13 +1781,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, cloexec); ATF_TP_ADD_TC(tp, mode); ATF_TP_ADD_TC(tp, fallocate); -<<<<<<< HEAD -||||||| parent of 91ddfd352f59 (posixshm_test: add naive page accounting test) - ATF_TP_ADD_TC(tp, fspacectl); -======= - ATF_TP_ADD_TC(tp, fspacectl); ATF_TP_ADD_TC(tp, accounting); ->>>>>>> 91ddfd352f59 (posixshm_test: add naive page accounting test) ATF_TP_ADD_TC(tp, largepage_basic); ATF_TP_ADD_TC(tp, largepage_config); ATF_TP_ADD_TC(tp, largepage_mmap);