From nobody Fri Jun 17 19:38:57 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 C3A6485BB44; Fri, 17 Jun 2022 19:38:58 +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 4LPq9G1rX1z3Qc7; Fri, 17 Jun 2022 19:38:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494738; 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=/p4VxnfGfpKhbKOxBh+qE5Pn3fX0s68U9mgGmpM0Dks=; b=wG+X0MeWpSot4ZcvQMXDmKTWvYLqfzO24zmxWuayjd3tc1Sv2puruIHNqlDj3Ljwab0Nn2 D5Ihu6X815w/mLFvuJ6iss52UWFZSKd7DgcRUfTwaQeyvZ42VIWWzKbMmhBqlhWxsAib7x G5toU8r1SMXrW58glMsHFs0wLZiSqPpWp0x/o0tLTo1jqtfAW571ITYx0hKGS+bkxnMIrr mWSrF35UgF6/pI+bN4z6qB8fD8uKOFqbhRefqD0O1bNUprLTIAZV0PnbVszu1EP87eeO9G p2cliu86KyfjG4iSQO+Ivt0+TL5DvdiSvsE3grTWxs0bMxPse9c05jLp3ex7vw== 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 0757F25A43; Fri, 17 Jun 2022 19:38:58 +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 25HJcvZw015379; Fri, 17 Jun 2022 19:38:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJcvIP015378; Fri, 17 Jun 2022 19:38:57 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:38:57 GMT Message-Id: <202206171938.25HJcvIP015378@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: ac33f043f654 - stable/13 - linux(4): Cleanup empty lines. 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: ac33f043f65437acbb5f868fafc412787b8df60a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494738; 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=/p4VxnfGfpKhbKOxBh+qE5Pn3fX0s68U9mgGmpM0Dks=; b=Zj1CJRKg1S68lfqkeb9R+NztZVfyCJcukKPWc2s9NshIHlkMWWTCAodg0C+SjdYXpfNLjP MRTuorlKsKQrcIVr6LiS2u8LUkqQmNTgChZWr3/4NxQFnOFLAF1HBDP2nU9SOkC2KTheTG Yg0pCuJjfGASzkQPXt1IkIkIFkp3yH8doBHsFvz0TGY5+Hj3IgDKnje8Lee9aV146O2ih7 HU2Kfj4l4Lt7P/w8xd+yv/ObHBtjYJxgVZcHEtBOqkREZJYy36BdeIwTFdRW1eOZYR4pbm 4GfUM6fw0z99jHgrhuNmIi9v03ziybs61Wk9E+jKMu0guFwmQgjXQDsXtsX2og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494738; a=rsa-sha256; cv=none; b=GFdXucQV1mNd8mJpc7rIfWaYb5LSmVsxSqE5N6VOSIC9PuK/JGtTbeZFbISEt2dNKITp0/ FaCvSol8m8xY1AYbJwYDvbN4/HFjmc3+NZIphi1jScVyC/i2ofZxEKZuINYIcFgXU2iEZd HtlSYJxvkF9p/L8ryFIitOWzdfTxSnuaDpmvLY4AYfCbjxLw5mJ3yVQNqJiEmkYYRBQ2kf W5y8wcRFdpzG3EXTjhMqVXPN3G16rQf58fsZP9jOvsI0TeETh5X495xHXkQ4JzJRHsOv9y exG1JJC+OdoOKHIXwYrkX//aJgNs9lDYOgRNsIOxsmQA0/9xieyy/E6fILiWJA== 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=ac33f043f65437acbb5f868fafc412787b8df60a commit ac33f043f65437acbb5f868fafc412787b8df60a Author: Dmitry Chagin AuthorDate: 2022-03-31 18:23:12 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:33:48 +0000 linux(4): Cleanup empty lines. MFC after: 2 weeks (cherry picked from commit 09d60bfae58f10a24c8fc7c06bd3d90b86d40e07) --- sys/compat/linux/linux_common.h | 1 - sys/compat/linux/linux_emul.c | 1 - sys/compat/linux/linux_socket.c | 2 +- sys/compat/linux/linux_stats.c | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_common.h b/sys/compat/linux/linux_common.h index c6837a6a3b52..0eb302bfcd17 100644 --- a/sys/compat/linux/linux_common.h +++ b/sys/compat/linux/linux_common.h @@ -45,5 +45,4 @@ void linux_to_bsd_poll_events(struct thread *td, int fd, short lev, short *bev); void bsd_to_linux_poll_events(short bev, short *lev); - #endif /* _LINUX_COMMON_H_ */ diff --git a/sys/compat/linux/linux_emul.c b/sys/compat/linux/linux_emul.c index 1e8da643bb9a..08510fc29a3f 100644 --- a/sys/compat/linux/linux_emul.c +++ b/sys/compat/linux/linux_emul.c @@ -189,7 +189,6 @@ linux_proc_init(struct thread *td, struct thread *newtd, bool init_thread) pem->persona = 0; pem->oom_score_adj = 0; } - } void diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index d51b9945b434..453a6621d9a7 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -727,7 +727,7 @@ linux_copyout_sockaddr(const struct sockaddr *sa, void *uaddr, size_t len) error = bsd_to_linux_sockaddr(sa, &lsa, len); if (error != 0) return (error); - + error = copyout(lsa, uaddr, len); free(lsa, M_SONAME); diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c index e01cb0c8d87a..fb2dd2fe01ef 100644 --- a/sys/compat/linux/linux_stats.c +++ b/sys/compat/linux/linux_stats.c @@ -800,4 +800,3 @@ linux_statx(struct thread *td, struct linux_statx_args *args) return (error); } -