On Thu, Dec 13, 2012 at 3:15 AM, Linus Torvalds <[email protected]> wrote: > On Wed, Dec 12, 2012 at 12:11 PM, David Miller <[email protected]> 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 -- 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/
