From: Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
To: Daniel Borkmann <dborkman-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: Li Zefan <lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>,
containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Neil Horman <nhorman-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>,
Thomas Graf <tgraf-G/eBtMaohhA@public.gmane.org>,
"David S. Miller" <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
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 [thread overview]
Message-ID: <20140118152813.GG3640@htj.dyndns.org> (raw)
In-Reply-To: <52DA9D20.6010301-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.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
WARNING: multiple messages have this Message-ID (diff)
From: Tejun Heo <tj@kernel.org>
To: Daniel Borkmann <dborkman@redhat.com>
Cc: Li Zefan <lizefan@huawei.com>,
containers@lists.linux-foundation.org, cgroups@vger.kernel.org,
linux-kernel@vger.kernel.org, Neil Horman <nhorman@tuxdriver.com>,
Thomas Graf <tgraf@suug.ch>,
"David S. Miller" <davem@davemloft.net>
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 [thread overview]
Message-ID: <20140118152813.GG3640@htj.dyndns.org> (raw)
In-Reply-To: <52DA9D20.6010301@redhat.com>
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
next prev parent reply other threads:[~2014-01-18 15:28 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-17 18:11 [PATCHSET cgroup/for-3.14] cgroup: drop module support and cgroup_root_mutex Tejun Heo
2014-01-17 18:11 ` Tejun Heo
[not found] ` <1389982317-22225-1-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2014-01-17 18:11 ` [PATCH 1/6] cgroup: make CONFIG_NET_CLS_CGROUP and CONFIG_NETPRIO_CGROUP bool instead of tristate Tejun Heo
2014-01-17 18:11 ` Tejun Heo
[not found] ` <1389982317-22225-2-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2014-01-17 20:37 ` Neil Horman
2014-01-17 20:37 ` Neil Horman
2014-01-18 1:08 ` Li Zefan
2014-01-18 1:08 ` Li Zefan
[not found] ` <52D9D421.6040608-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2014-01-18 11:25 ` Daniel Borkmann
2014-01-18 11:25 ` Daniel Borkmann
2014-01-18 15:10 ` Tejun Heo
2014-01-18 15:10 ` Tejun Heo
[not found] ` <20140118151006.GF3640-Gd/HAXX7CRxy/B6EtB590w@public.gmane.org>
2014-01-18 15:26 ` Daniel Borkmann
2014-01-18 15:26 ` Daniel Borkmann
[not found] ` <52DA9D20.6010301-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2014-01-18 15:28 ` Tejun Heo
2014-01-18 15:28 ` Tejun Heo [this message]
2014-01-18 15:28 ` Tejun Heo
[not found] ` <20140118152813.GG3640-Gd/HAXX7CRxy/B6EtB590w@public.gmane.org>
2014-01-18 15:29 ` Daniel Borkmann
2014-01-18 15:29 ` Daniel Borkmann
2014-01-18 3:10 ` David Miller
2014-01-18 3:10 ` David Miller
2014-01-18 3:10 ` David Miller
2014-01-17 18:11 ` [PATCH 2/6] cgroup: drop module support Tejun Heo
2014-01-17 18:11 ` Tejun Heo
2014-01-17 18:11 ` [PATCH 3/6] cgroup: clean up cgroup_subsys names and initialization Tejun Heo
2014-01-17 18:11 ` Tejun Heo
[not found] ` <1389982317-22225-4-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2014-01-17 20:49 ` Neil Horman
2014-01-17 20:49 ` Neil Horman
2014-01-17 20:49 ` Neil Horman
2014-01-18 3:10 ` David Miller
2014-01-18 3:10 ` David Miller
2014-01-20 13:13 ` Michal Hocko
2014-01-20 13:13 ` Michal Hocko
2014-01-20 13:13 ` Michal Hocko
2014-01-17 18:11 ` [PATCH 4/6] cgroup: rename cgroup_subsys->subsys_id to ->id Tejun Heo
2014-01-17 18:11 ` Tejun Heo
2014-01-17 18:11 ` [PATCH 5/6] cgroup: update locking in cgroup_show_options() Tejun Heo
2014-01-17 18:11 ` Tejun Heo
2014-01-17 18:11 ` [PATCH 6/6] cgroup: remove cgroup_root_mutex Tejun Heo
2014-01-17 18:11 ` Tejun Heo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140118152813.GG3640@htj.dyndns.org \
--to=tj-dgejt+ai2ygdnm+yrofe0a@public.gmane.org \
--cc=cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
--cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org \
--cc=dborkman-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org \
--cc=nhorman-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org \
--cc=tgraf-G/eBtMaohhA@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.