Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752201AbbKQLGI (ORCPT ); Tue, 17 Nov 2015 06:06:08 -0500 Received: from mail-ob0-f177.google.com ([209.85.214.177]:34723 "EHLO mail-ob0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750913AbbKQLGF (ORCPT ); Tue, 17 Nov 2015 06:06:05 -0500 MIME-Version: 1.0 In-Reply-To: References: <1442417823-15850-1-git-send-email-ludovic.desroches@atmel.com> <1442417823-15850-5-git-send-email-ludovic.desroches@atmel.com> Date: Tue, 17 Nov 2015 12:06:03 +0100 Message-ID: Subject: Re: [PATCH v2 4/7] ARM: at91/dt: sama5d2: add pio controller node From: Linus Walleij To: Olof Johansson Cc: Ludovic Desroches , Sascha Hauer , "linux-gpio@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "devicetree@vger.kernel.org" , Nicolas Ferre , Alexandre Belloni Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1068 Lines: 29 On Tue, Nov 10, 2015 at 1:30 AM, Olof Johansson wrote: > On Mon, Sep 21, 2015 at 11:24 AM, Linus Walleij > wrote: >> On Wed, Sep 16, 2015 at 8:37 AM, Ludovic Desroches >> wrote: >> >>> Add pio4 controller node to enable pinmux and gpio. >>> >>> Signed-off-by: Ludovic Desroches >> >> Patch applied. > > Please don't merge DT changes through driver trees unless there's a > very specific reason to do so, since it introduces random conflicts. Sorry :( Even noted this in the pull request to Torvalds, it was in the bottom of my patch stack so had been in -next for ages, I was afraid it would create more problem than it solves if I reverted the patch, but I guess I should have done so anyways. Yours, Linus Walleij -- 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/