Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933469AbaBURul (ORCPT ); Fri, 21 Feb 2014 12:50:41 -0500 Received: from mail-ob0-f173.google.com ([209.85.214.173]:65371 "EHLO mail-ob0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933014AbaBURuj (ORCPT ); Fri, 21 Feb 2014 12:50:39 -0500 Date: Fri, 21 Feb 2014 12:50:34 -0500 From: Matt Porter To: Markus Mayer Cc: Stephen Warren , Christian Daudt , ARM Kernel List , Linux Kernel Mailing List Subject: Re: [PATCH] ARM: bcm2835: Move to mach-bcm directory Message-ID: <20140221175034.GO5038@beef> References: <1392941771-15774-1-git-send-email-markus.mayer@linaro.org> <5306DBE4.8090106@wwwdotorg.org> <20140221140958.GK5038@beef> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Feb 21, 2014 at 09:41:53AM -0800, Markus Mayer wrote: > On 21 February 2014 06:09, Matt Porter wrote: > > On Thu, Feb 20, 2014 at 09:53:56PM -0700, Stephen Warren wrote: > >> On 02/20/2014 05:16 PM, Markus Mayer wrote: > >> > Move the bcm2835 board file into the mach-bcm directory. This allows us > >> > to get rid of the mach-bcm2835 directory with the associated Kconfig > >> > and Makefile. > >> > >> This looks fine, although it needs a small patch to bcm2835_defconfig > >> squashed in, which I'll post in a second. > >> > >> Do you want me to take it through the bcm2835 tree? That's probably > >> easiest to avoid conflicts with any other bcm2835 patches, not that it's > >> too likely there will be any to the board file. > > > > That's ok with me. Be aware that we may have minor Kconfig/Makefile > > conflicts between the bcm2835 tree and the mach-bcm tree since we just > > queued the bcm5301x support. > > Matt, will you squash Stephen's patch into mine when you take the > patches or should I submit a v2 of the patch that combines both? I think Stephen prefers to take this through the bcm2835 tree so I'll let him weigh in on that. -Matt -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/