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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
