On Wed, Dec 12, 2012 at 12:11 PM, David Miller <da...@davemloft.net> wrote:
>
> There is one merge conflict to resolve in net/sched/cls_cgroup.c,
> one commit changes the name of some members to "css_*" (this came
> from Tejun's tree) and another commit adds an "attach" method.
There's more than that. The ARM board mess is apparently now affecting
the networking merges too.
I fixed it up. Hopefully correctly.
Also, why does the new SHA1 hmac cookie support default to 'y'?
Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
