From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7
Date: Tue, 26 Apr 2016 10:12:53 +0200 [thread overview]
Message-ID: <7781705.p6jrBl2RnJ@wuerfel> (raw)
In-Reply-To: <CAMuHMdV_DN4YEzP1urC9LmKga6rkstGNDv20i96qnb=kS1+skw@mail.gmail.com>
On Tuesday 26 April 2016 09:30:45 Geert Uytterhoeven wrote:
>
> Commit 93fafa81cad3da9c ("Merge branches 'next/dt' and 'next/dt64' into
> for-next") accidentally re-added the line
>
> clock-output-names = "can_clk";
>
> to arch/arm/boot/dts/r8a7791.dtsi, which was removed in commit
> f617604fe5d74b9c ("ARM: dts: r8a7791: Remove unnecessary
> clock-output-names properties") before. It seems the same wrong
> conflict resolution was made before in commit ef3b08c6c0d85753 ("Merge
> branch 'fixes' into for-next").
>
> While this won't cause failures, can you please remove the offending
> line?
>
I've merged renesas-fixes-for-v4.6 into next/dt now to resolve
the conflict there, otherwise Linus would have to do the same resolution
during the merge window.
Thanks for letting us know. If you want to verify my new resolution,
please look at next/dt, which is the more important branch.
Arnd
next prev parent reply other threads:[~2016-04-26 8:12 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-25 4:27 [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Simon Horman
2016-04-25 4:27 ` [PATCH 01/22] ARM: dts: r8a7790: use fallback jpu compatibility string Simon Horman
2016-04-25 4:27 ` [PATCH 02/22] ARM: dts: r8a7791: " Simon Horman
2016-04-25 4:27 ` [PATCH 03/22] ARM: dts: r8a7790: Add SCIF2 clock Simon Horman
2016-04-25 4:27 ` [PATCH 04/22] ARM: dts: r8a7790: Add SCIF2 device node Simon Horman
2016-04-25 4:27 ` [PATCH 05/22] ARM: dts: r8a7791: use fallback can compatibility string Simon Horman
2016-04-25 4:27 ` [PATCH 06/22] ARM: dts: r8a7790: " Simon Horman
2016-04-25 4:27 ` [PATCH 07/22] ARM: dts: r8a7794: add CAN clocks to device tree Simon Horman
2016-04-25 4:27 ` [PATCH 08/22] ARM: dts: r8a7794: add CAN nodes " Simon Horman
2016-04-25 4:27 ` [PATCH 09/22] ARM: dts: r8a7793: add CAN clocks " Simon Horman
2016-04-25 4:27 ` [PATCH 10/22] ARM: dts: r8a7793: add CAN nodes " Simon Horman
2016-04-25 4:27 ` [PATCH 11/22] ARM: dts: r8a7794: add IIC clocks Simon Horman
2016-04-25 4:27 ` [PATCH 12/22] ARM: dts: r8a7794: Add IIC nodes Simon Horman
2016-04-25 4:27 ` [PATCH 13/22] ARM: dts: sh73a0: Correct interrupt type for ARM TWD Simon Horman
2016-04-25 4:27 ` [PATCH 14/22] ARM: dts: r8a7779: " Simon Horman
2016-04-25 4:27 ` [PATCH 15/22] ARM: dts: r8a7790: Use USB3.0 fallback compatibility string Simon Horman
2016-04-25 4:27 ` [PATCH 16/22] ARM: dts: r8a7791: " Simon Horman
2016-04-25 4:27 ` [PATCH 17/22] ARM: dts: r8a7790: Set maximum frequencies for SDHI clocks Simon Horman
2016-04-25 4:27 ` [PATCH 18/22] ARM: dts: r8a7790: lager: Enable UHS-I SDR-50 Simon Horman
2016-04-25 4:27 ` [PATCH 19/22] ARM: dts: kzm9g: Configure NMI key as wake-up source Simon Horman
2016-04-25 4:27 ` [PATCH 20/22] ARM: dts: r8a7790: fix max-frequency for SDHI Simon Horman
2016-04-25 4:27 ` [PATCH 21/22] ARM: dts: r8a7793: Add SDHI controllers Simon Horman
2016-04-25 4:27 ` [PATCH 22/22] ARM: dts: gose: Enable " Simon Horman
2016-04-25 21:02 ` [GIT PULL v2] Renesas ARM Based SoC DT Updates for v4.7 Arnd Bergmann
2016-04-26 7:30 ` Geert Uytterhoeven
2016-04-26 8:12 ` Arnd Bergmann [this message]
2016-04-26 8:32 ` Geert Uytterhoeven
2016-04-26 10:41 ` Arnd Bergmann
2016-04-26 11:22 ` Geert Uytterhoeven
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=7781705.p6jrBl2RnJ@wuerfel \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
/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