From mboxrd@z Thu Jan  1 00:00:00 1970
From: Pablo Neira Ayuso <pablo@netfilter.org>
Subject: Re: [PATCH] Add arpt_MARK to xt_mark
Date: Thu, 14 May 2015 13:02:51 +0200
Message-ID: <20150514110251.GA5223@salvia>
References: <1429237292-17701-1-git-send-email-zhangcy@cn.fujitsu.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: netfilter-devel@vger.kernel.org
To: Zhang Chunyu <zhangcy@cn.fujitsu.com>
Return-path: <netfilter-devel-owner@vger.kernel.org>
Received: from mail.us.es ([193.147.175.20]:43360 "EHLO mail.us.es"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751090AbbENLJ0 (ORCPT <rfc822;netfilter-devel@vger.kernel.org>);
	Thu, 14 May 2015 07:09:26 -0400
Content-Disposition: inline
In-Reply-To: <1429237292-17701-1-git-send-email-zhangcy@cn.fujitsu.com>
Sender: netfilter-devel-owner@vger.kernel.org
List-ID: <netfilter-devel.vger.kernel.org>

On Fri, Apr 17, 2015 at 10:21:32AM +0800, Zhang Chunyu wrote:
> for http://git.netfilter.org/arptables/commit/?h=next&id=4bb2f8340783fd3a3f70aa6f8807428a280f8474

This was sent when the nf-next merge window was closed, I'm going to
rescue this to let it get upstream.

I have also merged the -next branch into -master in userspace
arptables.

So applied, thanks Zhang.