linux-kernel - Re: linux-next: manual merge of the signal tree with Linus' 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-prev] [day] [month] [year] [list]

Message-ID: <51347480.3040906@imgtec.com>
Date:	Mon, 4 Mar 2013 10:16:32 +0000
From:	James Hogan <james.hogan@...tec.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Al Viro <viro@...IV.linux.org.uk>, <linux-next@...r.kernel.org>,
	<linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the signal tree with Linus' tree

On 04/03/13 02:03, Stephen Rothwell wrote:
> Hi Al,
> 
> Today's linux-next merge of the signal tree got a conflict in
> include/asm-generic/unistd.h between commit 4dd3c95940b8
> ("asm-generic/unistd.h: handle symbol prefixes in cond_syscall") from
> Linus' tree and commit 24a2641326f1 ("consolidate cond_syscall and
> SYSCALL_ALIAS declarations") from the signal tree.
> 
> I fixed it up (I used the signal tree version as I think it supersedes
> the former) and can carry the fix as necessary (no action is required).

Hi Stephen, Al,

It needs this change too, to match the change to arch/blackfin,
otherwise the build breaks for metag.

Cheers
James

diff --git a/arch/metag/include/asm/linkage.h b/arch/metag/include/asm/linkage.h
index 73bf25b..79c69bb 100644
--- a/arch/metag/include/asm/linkage.h
+++ b/arch/metag/include/asm/linkage.h
@@ -4,4 +4,6 @@
 #define __ALIGN .p2align 2
 #define __ALIGN_STR ".p2align 2"
 
+#define SYMBOL_NAME(_name_) _##_name_
+
 #endif


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