From: James Hogan <james.hogan@imgtec.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@ZenIV.linux.org.uk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the signal tree with Linus' tree
Date: Mon, 4 Mar 2013 10:16:32 +0000 [thread overview]
Message-ID: <51347480.3040906@imgtec.com> (raw)
In-Reply-To: <20130304130333.96ae5a2f223cca784bd1aa82@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1008 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: James Hogan <james.hogan@imgtec.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@ZenIV.linux.org.uk>, <linux-next@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the signal tree with Linus' tree
Date: Mon, 4 Mar 2013 10:16:32 +0000 [thread overview]
Message-ID: <51347480.3040906@imgtec.com> (raw)
In-Reply-To: <20130304130333.96ae5a2f223cca784bd1aa82@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1008 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-03-04 10:16 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-04 2:03 linux-next: manual merge of the signal tree with Linus' tree Stephen Rothwell
2013-03-04 10:16 ` James Hogan [this message]
2013-03-04 10:16 ` James Hogan
-- strict thread matches above, loose matches on Subject: below --
2013-03-28 4:28 Stephen Rothwell
2013-03-12 3:25 Stephen Rothwell
2013-03-04 1:58 Stephen Rothwell
2012-12-21 2:42 Stephen Rothwell
2012-12-21 2:42 Stephen Rothwell
2012-12-21 2:33 Stephen Rothwell
2012-08-21 4:57 Stephen Rothwell
2012-07-02 6:12 Stephen Rothwell
2012-07-02 6:12 ` Stephen Rothwell
2012-07-02 6:12 ` Stephen Rothwell
2012-05-24 5:54 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51347480.3040906@imgtec.com \
--to=james.hogan@imgtec.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.