Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754487AbbKQTPQ (ORCPT ); Tue, 17 Nov 2015 14:15:16 -0500 Received: from mail-yk0-f181.google.com ([209.85.160.181]:34186 "EHLO mail-yk0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752146AbbKQTPM (ORCPT ); Tue, 17 Nov 2015 14:15:12 -0500 MIME-Version: 1.0 X-Originating-IP: [2620:0:1000:157d:f4eb:ce20:9009:68e0] 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 11:15:11 -0800 Message-ID: Subject: Re: [PATCH v2 4/7] ARM: at91/dt: sama5d2: add pio controller node From: Olof Johansson To: Linus Walleij 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: 1640 Lines: 41 On Tue, Nov 17, 2015 at 3:06 AM, Linus Walleij wrote: > 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. Yeah, it's OK -- I spotted that pull request later as well. It's not a big deal in most specific instances, I'd say. It's just in aggregate it becomes a bother. So, just see this as a public reminder since we've seen it creep into other driver trees a bit more lately. Mistakes will still happen but try to keep it down. And for those who submit patches, feel free to point out in the patch that you don't expect the driver/subsystem maintainer to apply it to help them out. -Olof -- 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/