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: <20130621161801.34c4a75c217ca4c1b7d6529c@canb.auug.org.au>
Date:	Fri, 21 Jun 2013 16:18:01 +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>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	Linus Walleij <linus.walleij@...aro.org>
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
arch/arm/mach-u300/timer.c between commit 38ff87f77af0 ("sched_clock:
Make ARM's sched_clock generic for all architectures") from the tip tree
and commit 3c96d8ea8101 ("ARM: u300: enable delaytimer on the U300") 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 arch/arm/mach-u300/timer.c
index af771b7,390ae5f..0000000
--- a/arch/arm/mach-u300/timer.c
+++ b/arch/arm/mach-u300/timer.c
@@@ -18,12 -18,12 +18,12 @@@
  #include <linux/clk.h>
  #include <linux/err.h>
  #include <linux/irq.h>
 +#include <linux/sched_clock.h>
- 
- #include <mach/hardware.h>
- #include <mach/irqs.h>
+ #include <linux/delay.h>
+ #include <linux/of_address.h>
+ #include <linux/of_irq.h>
  
  /* Generic stuff */
 -#include <asm/sched_clock.h>
  #include <asm/mach/map.h>
  #include <asm/mach/time.h>
  

Content of type "application/pgp-signature" skipped