From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 647C7138334 for ; Tue, 26 Nov 2019 21:25:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94B43E0953; Tue, 26 Nov 2019 21:25:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7F558E0953 for ; Tue, 26 Nov 2019 21:25:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B37D134D42D for ; Tue, 26 Nov 2019 21:25:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D4688B5 for ; Tue, 26 Nov 2019 21:25:25 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1574803519.773bb1832df3815cd68c314d31d30045b001e9c9.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/zfs/files/0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch X-VCS-Directories: sys-fs/zfs/files/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 773bb1832df3815cd68c314d31d30045b001e9c9 X-VCS-Branch: master Date: Tue, 26 Nov 2019 21:25:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c21c2f55-613c-4b8e-93fc-c2594987b992 X-Archives-Hash: 52894886a3ec5a0a5a933b19efb7a201 commit: 773bb1832df3815cd68c314d31d30045b001e9c9 Author: Georgy Yakovlev gentoo org> AuthorDate: Tue Nov 26 21:23:36 2019 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Tue Nov 26 21:25:19 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=773bb183 sys-fs/zfs: fix 0.8.2-r2 patch path Package-Manager: Portage-2.3.79, Repoman-2.3.17 Signed-off-by: Georgy Yakovlev gentoo.org> sys-fs/zfs/files/0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys-fs/zfs/files/0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch b/sys-fs/zfs/files/0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch index be88f7bfee8..00dda6de55c 100644 --- a/sys-fs/zfs/files/0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch +++ b/sys-fs/zfs/files/0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch @@ -35,10 +35,10 @@ Closes #9436 man/man8/zpool.8 | 6 ++++++ 2 files changed, 16 insertions(+), 1 deletion(-) -diff --git a/lib/libzutil/os/linux/zutil_import_os.c b/lib/libzutil/os/linux/zutil_import_os.c +diff --git a/lib/libzutil/zutil_import.c b/lib/libzutil/zutil_import.c index 811eae397c9..e51004edc68 100644 ---- a/lib/libzutil/os/linux/zutil_import_os.c -+++ b/lib/libzutil/os/linux/zutil_import_os.c +--- a/lib/libzutil/zutil_import.c ++++ b/lib/libzutil/zutil_import.c @@ -53,6 +53,7 @@ #include #include