linux-kernel - linux-next: manual merge of the signal tree with the ftrace 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:	Fri, 30 Nov 2012 16:46:58 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Al Viro <viro@...IV.linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	David Sharp <dhsharp@...gle.com>,
	Steven Rostedt <rostedt@...dmis.org>
Subject: linux-next: manual merge of the signal tree with the ftrace tree

Hi Al,

Today's linux-next merge of the signal tree got a conflict in
arch/microblaze/include/asm/Kbuild between commit 8cbd9cc62540
("tracing,x86: Add a TSC trace_clock") from the ftrace tree and commit
24465a40ba45 ("take sys_fork/sys_vfork/sys_clone prototypes to
linux/syscalls.h") from the signal 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/microblaze/include/asm/Kbuild
index c5d7670,88a758a..0000000
--- a/arch/microblaze/include/asm/Kbuild
+++ b/arch/microblaze/include/asm/Kbuild
@@@ -1,4 -1,6 +1,5 @@@
 -include include/asm-generic/Kbuild.asm

 -header-y  += elf.h
  generic-y += clkdev.h
  generic-y += exec.h
 +generic-y += trace_clock.h
+ generic-y += syscalls.h

Content of type "application/pgp-signature" skipped