Messages in this thread | | | Date | Thu, 13 Dec 2012 22:52:54 +0100 | Subject | Re: [GIT] Networking | From | Olof Johansson <> |
| |
On Thu, Dec 13, 2012 at 3:15 AM, Linus Torvalds <torvalds@linux-foundation.org> wrote: > 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.
Yes, it looks correct. Sorry about missing that earlier, sfr had spotted it when it showed up in linux-next but I lost track of it.
We probably need to restructure/resort the device tree files to avoid add/add conflicts when people just append to them all the time. I really hope things will start to settle down churn-wise soon, as conversions and DT enablement starts to be more complete.
(I also think we need to improve the way we handle our topics some, we have a bit too much internal conflicts between topics in arm-soc still, but that's a separate subject).
-Olof
| |