From: Ludovic Desroches <ludovic.desroches@atmel.com>
To: Olof Johansson <olof@lixom.net>
Cc: Linus Walleij <linus.walleij@linaro.org>,
Ludovic Desroches <ludovic.desroches@atmel.com>,
Sascha Hauer <s.hauer@pengutronix.de>,
"linux-gpio@vger.kernel.org" <linux-gpio@vger.kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
Nicolas Ferre <nicolas.ferre@atmel.com>,
Alexandre Belloni <alexandre.belloni@free-electrons.com>
Subject: Re: [PATCH v2 4/7] ARM: at91/dt: sama5d2: add pio controller node
Date: Wed, 18 Nov 2015 08:25:08 +0100 [thread overview]
Message-ID: <20151118072508.GK16931@odux.rfo.atmel.com> (raw)
In-Reply-To: <CAOesGMhOmqr15Ou_QgJuiWdn6wWFYYLmy6eyf6zOopj8tKcadA@mail.gmail.com>
On Tue, Nov 17, 2015 at 11:15:11AM -0800, Olof Johansson wrote:
> On Tue, Nov 17, 2015 at 3:06 AM, Linus Walleij <linus.walleij@linaro.org> wrote:
> > On Tue, Nov 10, 2015 at 1:30 AM, Olof Johansson <olof@lixom.net> wrote:
> >> On Mon, Sep 21, 2015 at 11:24 AM, Linus Walleij
> >> <linus.walleij@linaro.org> wrote:
> >>> On Wed, Sep 16, 2015 at 8:37 AM, Ludovic Desroches
> >>> <ludovic.desroches@atmel.com> wrote:
> >>>
> >>>> Add pio4 controller node to enable pinmux and gpio.
> >>>>
> >>>> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
> >>>
> >>> 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.
>
Ok. Sorry, I didn't think it could cause so many conflicts if not taken
by Nicolas.
Ludovic
next prev parent reply other threads:[~2015-11-18 7:25 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-16 15:36 [PATCH v2 0/7] New Atmel PIO4 pinctrl/gpio driver Ludovic Desroches
2015-09-16 15:36 ` [PATCH v2 1/7] pinctrl: introduce driver for Atmel PIO4 controller Ludovic Desroches
2015-09-21 18:22 ` Linus Walleij
2015-09-16 15:36 ` [PATCH v2 2/7] pinctrl: dt-binding: Add DT binding documentation for Atmel PIO4 Ludovic Desroches
2015-09-16 15:36 ` [PATCH v2 3/7] MAINTAINERS: Add an entry for pinctrl-at91-pio4 Ludovic Desroches
2015-09-21 18:24 ` Linus Walleij
2015-09-16 15:37 ` [PATCH v2 4/7] ARM: at91/dt: sama5d2: add pio controller node Ludovic Desroches
2015-09-21 18:24 ` Linus Walleij
2015-11-10 0:30 ` Olof Johansson
2015-11-17 11:06 ` Linus Walleij
2015-11-17 19:15 ` Olof Johansson
2015-11-18 7:25 ` Ludovic Desroches [this message]
2015-09-16 15:37 ` [PATCH v2 5/7] ARM: at91/defconfig: sama5: add PIO4 controller support Ludovic Desroches
2015-09-21 18:25 ` Linus Walleij
2015-09-23 14:44 ` Nicolas Ferre
2015-09-16 15:37 ` [PATCH v2 6/7] ARM: at91/dt: add sama5d2 pinmux Ludovic Desroches
2015-09-21 18:27 ` Linus Walleij
2015-09-16 15:37 ` [PATCH v2 7/7] ARM: at91/dt: sama5d2 Xplained: add device pin muxing Ludovic Desroches
2015-09-21 18:29 ` Linus Walleij
2015-09-21 18:50 ` [PATCH v2 0/7] New Atmel PIO4 pinctrl/gpio driver Linus Walleij
2015-09-23 14:46 ` Nicolas Ferre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151118072508.GK16931@odux.rfo.atmel.com \
--to=ludovic.desroches@atmel.com \
--cc=alexandre.belloni@free-electrons.com \
--cc=devicetree@vger.kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nicolas.ferre@atmel.com \
--cc=olof@lixom.net \
--cc=s.hauer@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®