From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pablo Neira Ayuso Subject: Re: [PATCH] extensions: libxt_devgroup: Add translation to nft Date: Tue, 22 Dec 2015 18:00:12 +0100 Message-ID: <20151222170012.GA20795@salvia> References: <20151220120336.GA27589@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: netfilter-devel@vger.kernel.org To: Shivani Bhardwaj Return-path: Received: from mail.us.es ([193.147.175.20]:35662 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754718AbbLVRAS (ORCPT ); Tue, 22 Dec 2015 12:00:18 -0500 Received: from antivirus1-rhel7.int (unknown [192.168.2.11]) by mail.us.es (Postfix) with ESMTP id 0763323CF67 for ; Tue, 22 Dec 2015 18:00:17 +0100 (CET) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id EE06CDA860 for ; Tue, 22 Dec 2015 18:00:16 +0100 (CET) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 10064DA814 for ; Tue, 22 Dec 2015 18:00:14 +0100 (CET) Content-Disposition: inline In-Reply-To: <20151220120336.GA27589@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org List-ID: On Sun, Dec 20, 2015 at 05:33:37PM +0530, Shivani Bhardwaj wrote: > Add translation of device group to nftables. git am /tmp/extensions-libxt_devgroup-Add-translation-to-nft.patch -s Applying: extensions: libxt_devgroup: Add translation to nft error: patch failed: extensions/libxt_devgroup.c:37 error: extensions/libxt_devgroup.c: patch does not apply Patch failed at 0001 extensions: libxt_devgroup: Add translation to nft The copy of the patch that failed is found in: /home/pablo/devel/scm/git-netfilter/iptables/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". This one doesn't apply for some reason.