From nobody Fri Jun 17 19:37:52 2022 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 F3F2585ACE3; Fri, 17 Jun 2022 19:37:53 +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 4LPq813x7jz3Q0k; Fri, 17 Jun 2022 19:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494673; 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=wcNjv1ylMqxytuH00KYvvny4wt53B72CGQMQw0RdRcA=; b=fXtCBLjaM6Oy7pSux3+JsmxQyntAUZbUrUTPDrjJZPFefDXccGNf7gFQUQP67oP7VhEP3r Nlrfkq31pZyhTamn2mwvFwu5LHHfshoAkEhc0iDo8XDm/yI1hKsIWOtF0awCnWckiZh22e DEo3TgoX5kunlH75ow1P79tT3Wi3WfnOiaxVnuUCroITS9222ORyRwut88FIZTQ0rk9EOU aXFm5Pr+u1KumDvp6Rnq6ic5lMWT4eOKZvFnye9SuoCwxtwcg8+0kL0ud+e6aAC5kkV6pY s5Sk8i175eSvp5bdcqs3EhmsdWMy6bBbXJ6LGG5naZFXbJCfNPGrzcQJbVrYYQ== 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 0F59B25C3E; Fri, 17 Jun 2022 19:37:53 +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 25HJbqQG013941; Fri, 17 Jun 2022 19:37:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJbqsO013940; Fri, 17 Jun 2022 19:37:52 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:37:52 GMT Message-Id: <202206171937.25HJbqsO013940@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 7989803dba81 - stable/13 - linux(4): Fix futex copyrights. 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7989803dba81f7db303c1d8a7c480b3cbc497cfd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494673; 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=wcNjv1ylMqxytuH00KYvvny4wt53B72CGQMQw0RdRcA=; b=x94gyItHFbpwOFKopRtYpWVyxPESZ3sY+sFH6uzggRjYQECsXvmA/Ps5B95kUIrIp6OSGX yB3zEoukkhraup6xQeqlGCY46dNovP6JsP5xepN81/L/IudMJIAnoLTWsdXLO78saFTOOs HH7KGKQoliAmUrKG90JQyRtZVxHE0hH4wmXAoPu5tkhSWqGjZxMCdzC3/Zt2iCsQsi2WoU q2REUwKh/tc4VsKqO7EPNYwpBLopFO2lt+7SiOxOQPgn8lAHJVKFmTIIZHYsgDVIVoSwzJ 92KtSb8X80tvuKrXG62/DfitioMESPOrWAq5vgp9/tEKT+rnwBFPOuXFF4R/5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494673; a=rsa-sha256; cv=none; b=Cp8jdwAHq6F64PBZDRNKDEoY+Q9SfLSdzzB7a10n3YR0VWz2v7h+aZze0/BVA9rI4dKqn2 6qtfmKK8uCe8dZ1NOtKrOJPPHiWA7/Lod/lQBdcfvE1UhTo0mVQ4BACR+hVahPGguJ423D ajnPoS0pddzWvYcjvbnvkvMohPbLNrfS4VPJJRfpuuOhb3QqwRq+TkEZAYG90qC21jFYZK bignvFVevcShFypF6OWJxAl/MqwV0ynE/LzXDhEAAPT3dnGvRVobRcUnGjgWkgNU/KcIX2 P9vQ+4JYEwF6dbKx9STZLse8KP+lcriFVzGe9qvdpIh4qYhhe8QfNMHuA+O6DA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=7989803dba81f7db303c1d8a7c480b3cbc497cfd commit 7989803dba81f7db303c1d8a7c480b3cbc497cfd Author: Dmitry Chagin AuthorDate: 2021-08-12 08:36:24 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:33:26 +0000 linux(4): Fix futex copyrights. As no more NetBSD code in futexes exists replace NetBSD copyrights by standard FreeBSD 2 clause license. Add Roman Divacky's copyrights as an author of the robust futexes. Differential revision: https://reviews.freebsd.org/D31347 MFC after: 2 weeks (cherry picked from commit 6e31bed646c2f67cbcfd4bb2ce38aadd15868dcc) --- sys/compat/linux/linux_futex.c | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c index edd2e369f0cf..e85d7792841b 100644 --- a/sys/compat/linux/linux_futex.c +++ b/sys/compat/linux/linux_futex.c @@ -1,11 +1,8 @@ -/* $NetBSD: linux_futex.c,v 1.7 2006/07/24 19:01:49 manu Exp $ */ - /*- - * SPDX-License-Identifier: BSD-4-Clause + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2005 Emmanuel Dreyfus - * All rights reserved. - * Copyright (c) 2009-2016 Dmitry Chagin + * Copyright (c) 2009-2021 Dmitry Chagin + * Copyright (c) 2008 Roman Divacky * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -15,31 +12,22 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Emmanuel Dreyfus - * 4. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. * - * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include __FBSDID("$FreeBSD$"); -#if 0 -__KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.7 2006/07/24 19:01:49 manu Exp $"); -#endif #include "opt_compat.h"