linux-kernel - linux-next: manual merge of the tip tree with the arm 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]

Date:	Thu, 20 Jun 2013 15:05:50 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Stephen Boyd <sboyd@...eaurora.org>,
	John Stultz <john.stultz@...aro.org>,
	"Uwe Kleine-König" 
	<u.kleine-koenig@...gutronix.de>,
	Russell King <rmk@....linux.org.uk>
Subject: linux-next: manual merge of the tip tree with the arm tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/arm/kernel/Makefile between commit 4477ca45fb36 ("ARM: ARMv7-M:
Allow the building of new kernel port") from the arm tree and commit
38ff87f77af0 ("sched_clock: Make ARM's sched_clock generic for all
architectures") from the tip 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/kernel/Makefile
index fccfbdb,97cb057..0000000
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@@ -15,8 -15,8 +15,8 @@@ CFLAGS_REMOVE_return_address.o = -p
  
  # Object file lists.
  
 -obj-y		:= elf.o entry-armv.o entry-common.o irq.o opcodes.o \
 +obj-y		:= elf.o entry-common.o irq.o opcodes.o \
- 		   process.o ptrace.o return_address.o sched_clock.o \
+ 		   process.o ptrace.o return_address.o \
  		   setup.o signal.o stacktrace.o sys_arm.o time.o traps.o
  
  obj-$(CONFIG_ATAGS)		+= atags_parse.o

Content of type "application/pgp-signature" skipped