linux-kernel - linux-next: manual merge of the arm-soc tree with the tip 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>] [day] [month] [year] [list]

Message-Id: <20130620171452.365bf173b71870c690d52e27@canb.auug.org.au>
Date:	Thu, 20 Jun 2013 17:14:52 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Stephen Boyd <sboyd@...eaurora.org>,
	John Stultz <john.stultz@...aro.org>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	Heiko Stuebner <heiko@...ech.de>,
	Baruch Siach <baruch@...s.co.il>
Subject: linux-next: manual merge of the arm-soc tree with the tip tree

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/clocksource/dw_apb_timer_of.c between commits 0a0a7e66fa26
("clocksource: dw_apb: Remove unused header") and 38ff87f77af0
("sched_clock: Make ARM's sched_clock generic for all architectures")
from the tip tree and commit a8b447f2bbbb ("clocksource: dw_apb_timer_of:
add clock-handling") from the arm-soc 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/clocksource/dw_apb_timer_of.c
index d9a1e8d,cef5544..0000000
--- a/drivers/clocksource/dw_apb_timer_of.c
+++ b/drivers/clocksource/dw_apb_timer_of.c
@@@ -20,8 -20,11 +20,9 @@@
  #include <linux/of.h>
  #include <linux/of_address.h>
  #include <linux/of_irq.h>
 +#include <linux/sched_clock.h>
+ #include <linux/clk.h>
  
 -#include <asm/mach/time.h>
 -#include <asm/sched_clock.h>
 -
  static void timer_get_base_and_rate(struct device_node *np,
  				    void __iomem **base, u32 *rate)
  {

Content of type "application/pgp-signature" skipped