From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tejun Heo Subject: Re: [PATCH 1/6] cgroup: make CONFIG_NET_CLS_CGROUP and CONFIG_NETPRIO_CGROUP bool instead of tristate Date: Sat, 18 Jan 2014 10:28:13 -0500 Message-ID: <20140118152813.GG3640@htj.dyndns.org> References: <1389982317-22225-1-git-send-email-tj@kernel.org> <1389982317-22225-2-git-send-email-tj@kernel.org> <52D9D421.6040608@huawei.com> <20140118151006.GF3640@htj.dyndns.org> <52DA9D20.6010301@redhat.com> Mime-Version: 1.0 Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=/getzNxH4CNRYQYgOvpy8ET29W3pbKrgBZF5arNK2R0=; b=wnh+y93gPGYA6KEmWHlig379OhlL5kZ5LiEQhHL3fWhfrut2/viCbWUFb0RSiMPVpK qG17Bckb8eiKAEsnsmUzcj65C6HbRT92naU/PioWcwYYefMmXiBFuVZwWirRk36i2PzS 4sIkLRt8VcqlbW69yF1jO7MufkZ3ZbfsYCNvBWdeeO5UZVHVXipmM9bEyrqsOlih5O/8 655K58C+cAzaPJttV26Sood9n1NA+NehRV8p2Ug66Vo90aFNK6H+yI1NxUs/ByyGPgQK B6MA0IBaYmEb22X5OLE3rwzURXWfR4ch9fVPYKRVd8basMfPHEhJKscxlcuIuhHz4d/3 2rxw== Content-Disposition: inline In-Reply-To: <52DA9D20.6010301-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Sender: cgroups-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-ID: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Daniel Borkmann Cc: Li Zefan , containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Neil Horman , Thomas Graf , "David S. Miller" On Sat, Jan 18, 2014 at 04:26:24PM +0100, Daniel Borkmann wrote: > >Unless there's gonna be another rc, I think it's already a bit too > >late for 3.14 anyway. I'll drop the net_cls part and rebase the > >changes on top of rc1 later on. > > I think that's 1 patch of your series, right? They overlap. > I think this one could still go through net-next if you want, that would > avoid a merge conflict. If there's gonna be another rc, I'll prolly just cherry-pick the commit from net-next and then rebase the rest on top of it. If there isn't gonna be another rc, I'm just gonna base everything on v3.14-rc1 which would include the patch from net-next. Thanks. -- tejun From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753491AbaARP2S (ORCPT ); Sat, 18 Jan 2014 10:28:18 -0500 Received: from mail-qe0-f52.google.com ([209.85.128.52]:51553 "EHLO mail-qe0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753153AbaARP2Q (ORCPT ); Sat, 18 Jan 2014 10:28:16 -0500 Date: Sat, 18 Jan 2014 10:28:13 -0500 From: Tejun Heo To: Daniel Borkmann Cc: Li Zefan , containers@lists.linux-foundation.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Horman , Thomas Graf , "David S. Miller" Subject: Re: [PATCH 1/6] cgroup: make CONFIG_NET_CLS_CGROUP and CONFIG_NETPRIO_CGROUP bool instead of tristate Message-ID: <20140118152813.GG3640@htj.dyndns.org> References: <1389982317-22225-1-git-send-email-tj@kernel.org> <1389982317-22225-2-git-send-email-tj@kernel.org> <52D9D421.6040608@huawei.com> <20140118151006.GF3640@htj.dyndns.org> <52DA9D20.6010301@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <52DA9D20.6010301@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Jan 18, 2014 at 04:26:24PM +0100, Daniel Borkmann wrote: > >Unless there's gonna be another rc, I think it's already a bit too > >late for 3.14 anyway. I'll drop the net_cls part and rebase the > >changes on top of rc1 later on. > > I think that's 1 patch of your series, right? They overlap. > I think this one could still go through net-next if you want, that would > avoid a merge conflict. If there's gonna be another rc, I'll prolly just cherry-pick the commit from net-next and then rebase the rest on top of it. If there isn't gonna be another rc, I'm just gonna base everything on v3.14-rc1 which would include the patch from net-next. Thanks. -- tejun