Messages in this thread | | | Date | Sat, 18 Jan 2014 10:28:13 -0500 | From | Tejun Heo <> | Subject | Re: [PATCH 1/6] cgroup: make CONFIG_NET_CLS_CGROUP and CONFIG_NETPRIO_CGROUP bool instead of tristate |
| |
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
| |