From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756069Ab2LMVw4 (ORCPT ); Thu, 13 Dec 2012 16:52:56 -0500 Received: from mail-ia0-f174.google.com ([209.85.210.174]:38347 "EHLO mail-ia0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755490Ab2LMVwz (ORCPT ); Thu, 13 Dec 2012 16:52:55 -0500 MIME-Version: 1.0 X-Originating-IP: [2620:0:1000:1b02:ae16:2dff:fe07:4e83] In-Reply-To: References: <20121212.151116.143443755590581447.davem@davemloft.net> Date: Thu, 13 Dec 2012 22:52:54 +0100 Message-ID: Subject: Re: [GIT] Networking From: Olof Johansson To: Linus Torvalds Cc: David Miller , Andrew Morton , Network Development , Linux Kernel Mailing List , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, Tony Lindgren Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Dec 13, 2012 at 3:15 AM, Linus Torvalds wrote: > On Wed, Dec 12, 2012 at 12:11 PM, David Miller 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