From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the signal tree with Linus' tree
Date: Mon, 4 Mar 2013 12:58:51 +1100 [thread overview]
Message-ID: <20130304125851.9c4742ac4c8d0061fa71e0c0@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 866 bytes --]
Hi Al,
Today's linux-next merge of the signal tree got a conflict in
arch/tile/Kconfig between commit 887cbce0adea ("arch Kconfig: centralise
CONFIG_ARCH_NO_VIRT_TO_BUS") from Linus' tree and commit 15d9a5d9296a
("make HAVE_SYSCALL_WRAPPERS unconditional") 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@canb.auug.org.au
diff --cc arch/tile/Kconfig
index 1404497,4069d87..0000000
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@@ -16,8 -16,6 +16,7 @@@ config TIL
select GENERIC_PENDING_IRQ if SMP
select GENERIC_IRQ_SHOW
select HAVE_DEBUG_BUGVERBOSE
- select HAVE_SYSCALL_WRAPPERS if TILEGX
+ select HAVE_VIRT_TO_BUS
select SYS_HYPERVISOR
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select GENERIC_CLOCKEVENTS
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-03-04 1:59 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-04 1:58 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-03-28 4:28 linux-next: manual merge of the signal tree with Linus' tree Stephen Rothwell
2013-03-12 3:25 Stephen Rothwell
2013-03-04 2:03 Stephen Rothwell
2013-03-04 10:16 ` James Hogan
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-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=20130304125851.9c4742ac4c8d0061fa71e0c0@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).