linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mike Turquette <mturquette@baylibre.com>,
	Stephen Boyd <sboyd@codeaurora.org>,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	ARM <linux-arm-kernel@lists.infradead.org>,
	Linux-Next <linux-next@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	Geert Uytterhoeven <geert+renesas@glider.be>,
	Simon Horman <horms@verge.net.au>
Subject: Re: linux-next: manual merge of the clk tree with the arm-soc tree
Date: Tue, 22 Nov 2016 10:36:46 +0100	[thread overview]
Message-ID: <CAMuHMdU5Df2kNT=ccr7Ts6=a1ELRJdiBbh1xxuqo+e_UeYw-tw@mail.gmail.com> (raw)
In-Reply-To: <20161122194130.4efdd019@canb.auug.org.au>

Hi Stephen,

On Tue, Nov 22, 2016 at 9:41 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the clk tree got conflicts in:
>
>   arch/arm/boot/dts/r8a7779.dtsi
>   arch/arm/boot/dts/r8a7790.dtsi
>   arch/arm/boot/dts/r8a7791.dtsi
>   arch/arm/boot/dts/r8a7792.dtsi
>   arch/arm/boot/dts/r8a7793.dtsi
>   arch/arm/boot/dts/r8a7794.dtsi
>   arch/arm/mach-shmobile/setup-rcar-gen2.c
>   arch/arm64/boot/dts/renesas/r8a7795.dtsi
>   arch/arm64/boot/dts/renesas/r8a7796.dtsi
>   drivers/soc/renesas/Makefile
>
> between various commits from the arm-soc tree and commits from the
> clk tree.
>
> It was just too much at this time of day, so please talk to each other
> and figure out how to fix these up.  I have used the clk tree from
> next-20161117 for today.

Most of these are of the "add both sides" type.
The only exception is the one in arch/arm/mach-shmobile/setup-rcar-gen2.c,
where you just want to keep the call to of_clk_init(NULL);

There's a resolution in
https://git.kernel.org/cgit/linux/kernel/git/geert/renesas-drivers.git/log/?h=renesas-devel-20161117v2-v4.9-rc5%2brcar-rst

Sorry for the mess.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

  reply	other threads:[~2016-11-22  9:36 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-22  8:41 linux-next: manual merge of the clk tree with the arm-soc tree Stephen Rothwell
2016-11-22  9:36 ` Geert Uytterhoeven [this message]
2016-11-22 23:59   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2016-03-01  3:57 Stephen Rothwell
2016-03-01  4:00 ` Stephen Rothwell
2016-03-01  8:38   ` Nicolas Ferre
2015-02-03  5:31 Stephen Rothwell
2015-02-03 18:25 ` Mike Turquette
2015-02-03  5:28 Stephen Rothwell
2014-01-13  5:06 Stephen Rothwell
2014-01-26 20:59 ` Tomasz Figa
2014-01-26 21:05   ` Tomasz Figa
2013-06-17  7:27 Stephen Rothwell
2013-06-17 18:49 ` Mike Turquette
2013-04-19  7:27 Stephen Rothwell
2013-04-19  9:47 ` Pawel Moll
2013-02-02 12:27 Stephen Rothwell
2013-02-04 17:54 ` Mike Turquette
2012-11-28  6:12 Stephen Rothwell
2012-10-30  4:06 Stephen Rothwell
2012-10-30 10:11 ` Mike Turquette
2012-10-30 10:39   ` Pawel Moll
2012-09-10  6:14 Stephen Rothwell
2012-09-10 15:24 ` Linus Walleij
2012-09-10 16:51   ` Mike Turquette
2012-07-13  5:14 Stephen Rothwell
2012-07-13 15:10 ` Rob Herring
2012-07-13 17:27   ` Mike Turquette

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='CAMuHMdU5Df2kNT=ccr7Ts6=a1ELRJdiBbh1xxuqo+e_UeYw-tw@mail.gmail.com' \
    --to=geert@linux-m68k.org \
    --cc=arnd@arndb.de \
    --cc=geert+renesas@glider.be \
    --cc=horms@verge.net.au \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mturquette@baylibre.com \
    --cc=olof@lixom.net \
    --cc=sboyd@codeaurora.org \
    --cc=sfr@canb.auug.org.au \
    /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;
as well as URLs for NNTP newsgroup(s).