From owner-freebsd-current@FreeBSD.ORG Thu Oct 10 08:47:41 2013 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1EE0F8BB for ; Thu, 10 Oct 2013 08:47:41 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 6E83E2A35 for ; Thu, 10 Oct 2013 08:47:39 +0000 (UTC) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id LAA18173 for ; Thu, 10 Oct 2013 11:47:38 +0300 (EEST) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1VUBuE-00036E-Au for freebsd-current@FreeBSD.org; Thu, 10 Oct 2013 11:47:38 +0300 Message-ID: <52566972.3090204@FreeBSD.org> Date: Thu, 10 Oct 2013 11:46:42 +0300 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.0 MIME-Version: 1.0 To: FreeBSD Current Subject: (bsd)patch vs file removal X-Enigmail-Version: 1.5.2 Content-Type: text/plain; charset=X-VIET-VPS Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Oct 2013 08:47:41 -0000 The following is from patch -C -p1: Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/sys/cddl/compat/opensolaris/sys/taskq.h b/sys/cddl/compat/opensolaris/sys/taskq.h |deleted file mode 100644 |index ffe70ca..0000000 |--- a/sys/cddl/compat/opensolaris/sys/taskq.h |+++ /dev/null -------------------------- Patching file sys/cddl/compat/opensolaris/sys/taskq.h using Plan A... Empty context always matches. Hunk #1 failed at 0. 1 out of 1 hunks failed while patching sys/cddl/compat/opensolaris/sys/taskq.h -- Andriy Gapon