From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Behan Webster <behanw@converseincode•com>,
llvmlinux@lists•linuxfoundation.org,
Russell King <linux@arm•linux.org.uk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix•de>
Subject: linux-next: manual merge of the llvmlinux tree with the arm tree
Date: Fri, 26 Sep 2014 19:21:45 +1000 [thread overview]
Message-ID: <20140926192145.701bde05@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1169 bytes --]
Hi all,
Today's linux-next merge of the llvmlinux tree got a conflict in
arch/arm/kernel/return_address.c between commit 95e750c0bac4 ("ARM:
8160/1: drop warning about return_address not using unwind tables")
from the arm tree and commit eeb5c3a69694 ("arm: LLVMLinux: use static
inline in ARM ftrace.h") from the llvmlinux tree (which also exists in
the arm tree).
I fixed it up (I took out the now empty #else clause ... see below) and
can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/arm/kernel/return_address.c
index 98ea4b7eb406,b7de88a40176..000000000000
--- a/arch/arm/kernel/return_address.c
+++ b/arch/arm/kernel/return_address.c
@@@ -57,8 -56,12 +56,6 @@@ void *return_address(unsigned int level
return NULL;
}
--#else /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) */
-
-#if defined(CONFIG_ARM_UNWIND)
-#warning "TODO: return_address should use unwind tables"
-#endif
--
#endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
EXPORT_SYMBOL_GPL(return_address);
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
reply other threads:[~2014-09-26 9:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20140926192145.701bde05@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=behanw@converseincode$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@arm$(echo .)linux.org.uk \
--cc=llvmlinux@lists$(echo .)linuxfoundation.org \
--cc=u.kleine-koenig@pengutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox