Messages in this thread | | | From | Linus Torvalds <> | Date | Wed, 12 Dec 2012 18:15:04 -0800 | Subject | Re: [GIT] Networking |
| |
On Wed, Dec 12, 2012 at 12:11 PM, David Miller <davem@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
| |