From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Borkmann Subject: Re: [PATCH 1/6] cgroup: make CONFIG_NET_CLS_CGROUP and CONFIG_NETPRIO_CGROUP bool instead of tristate Date: Sat, 18 Jan 2014 16:29:31 +0100 Message-ID: <52DA9DDB.407@redhat.com> 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> <20140118152813.GG3640@htj.dyndns.org> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20140118152813.GG3640-Gd/HAXX7CRxy/B6EtB590w@public.gmane.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Content-Type: text/plain; charset="us-ascii"; format="flowed" To: Tejun Heo Cc: Neil Horman , containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Thomas Graf , cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, "David S. Miller" On 01/18/2014 04:28 PM, Tejun Heo wrote: > 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. Ok, sounds good. Thanks Tejun.