From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Rusty Russell <rusty@rustcorp•com.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
David Howells <dhowells@redhat•com>,
Michael Cree <mcree@orcon•net.nz>
Subject: linux-next: manual merge of the rr tree with Linus' tree
Date: Tue, 21 Aug 2012 12:11:26 +1000 [thread overview]
Message-ID: <20120821121126.f26a74eeeb19093b6d33d7ee@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1014 bytes --]
Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
arch/alpha/Kconfig between commit f2db633d301b ("alpha: Use new generic
strncpy_from_user() and strnlen_user()") from Linus' tree and commit
d673c23ca730 ("Make most arch asm/module.h files use
asm-generic/module.h") from the rr tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/alpha/Kconfig
index 9944ded,e73a1a7..0000000
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@@ -18,8 -18,8 +18,10 @@@ config ALPH
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select GENERIC_SMP_IDLE_THREAD
select GENERIC_CMOS_UPDATE
+ select GENERIC_STRNCPY_FROM_USER
+ select GENERIC_STRNLEN_USER
+ select HAVE_MOD_ARCH_SPECIFIC
+ select MODULES_USE_ELF_RELA
help
The Alpha is a 64-bit general-purpose processor designed and
marketed by the Digital Equipment Corporation of blessed memory,
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-08-21 2:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-21 2:11 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-05-23 2:15 linux-next: manual merge of the rr tree with Linus' tree Stephen Rothwell
2010-01-18 4:06 Stephen Rothwell
2010-01-12 2:13 Stephen Rothwell
2009-12-17 2:07 Stephen Rothwell
2009-09-15 3:26 Stephen Rothwell
2009-08-24 3:07 Stephen Rothwell
2009-07-06 2:05 Stephen Rothwell
2009-06-29 3:43 Stephen Rothwell
2009-06-24 3:08 Stephen Rothwell
2009-06-12 3:54 Stephen Rothwell
2009-05-27 3:55 Stephen Rothwell
2009-04-16 2:19 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=20120821121126.f26a74eeeb19093b6d33d7ee@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dhowells@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mcree@orcon$(echo .)net.nz \
--cc=rusty@rustcorp$(echo .)com.au \
/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