linux-next: manual merge of the clk tree with the arm-soc tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the clk tree with the arm-soc tree
Date	2016-11-22 09:50 +0100
Message-ID	<sGeW6-4Pc-37@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi all,

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.

-- 
Cheers,
Stephen Rothwell

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the clk tree with the arm-soc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-11-22 09:50 +0100
  Re: linux-next: manual merge of the clk tree with the arm-soc tree Geert Uytterhoeven <geert@linux-m68k.org> - 2016-11-22 10:40 +0100
    Re: linux-next: manual merge of the clk tree with the arm-soc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-11-23 01:00 +0100

csiph-web