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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 22 Nov 2016 19:41:30 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Mike Turquette <mturquette@...libre.com>,
        Stephen Boyd <sboyd@...eaurora.org>,
        Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
        ARM <linux-arm-kernel@...ts.infradead.org>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        Geert Uytterhoeven <geert+renesas@...der.be>
Subject: linux-next: manual merge of the clk tree with the arm-soc tree

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