linux-kernel - linux-next: manual merge of the clk tree with the driver-core 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]

Message-ID: <20140730185708.12a99f00@canb.auug.org.au>
Date:	Wed, 30 Jul 2014 18:57:08 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mike Turquette <mturquette@...aro.org>, Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sylwester Nawrocki <s.nawrocki@...sung.com>,
	Kim Phillips <kim.phillips@...escale.com>
Subject: linux-next: manual merge of the clk tree with the driver-core tree

Hi Mike,

Today's linux-next merge of the clk tree got a conflict in
drivers/base/platform.c between commit 3d713e0e382e ("driver core:
platform: add device binding path 'driver_override'") from the
driver-core tree and commit 86be408bfbd8 ("clk: Support for clock
parents and rates assigned from device tree") from the clk tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/base/platform.c
index 7cc7440b014d,ac47643b1b69..000000000000
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@@ -23,7 -23,7 +23,8 @@@
  #include <linux/pm_runtime.h>
  #include <linux/idr.h>
  #include <linux/acpi.h>
 +#include <linux/limits.h>
+ #include <linux/clk/clk-conf.h>

  #include "base.h"
  #include "power/power.h"

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)