From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kyle McMartin <kyle@mcmartin.ca>, linux-parisc@vger.kernel.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
David Howells <dhowells@redhat.com>
Subject: linux-next: manual merge of the parisc tree with Linus' tree
Date: Fri, 9 Oct 2009 11:21:58 +1100 [thread overview]
Message-ID: <20091009112158.7d37ed23.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 737 bytes --]
Hi all,
Today's linux-next merge of the parisc tree got conflicts in
arch/parisc/include/asm/thread_info.h and arch/parisc/kernel/entry.S
between commit d0420c83f39f79afb82010c2d2cafd150eef651b ("KEYS: Extend
TIF_NOTIFY_RESUME to (almost) all architectures [try #6]") from Linus'
tree and commit 9f4259771faf1ffd99888796d925adae4c93630b ("parisc: add
TIF_NOTIFY_RESUME and use tracehook_notify_resume") from the parisc tree.
It looks like the parisc tree version is a superset of the version in
Linus' tree (for parisc). I fixed it up (hopefully - using the parisc
tree versions) and can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2009-10-09 0:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-09 0:21 Stephen Rothwell [this message]
2009-10-09 18:39 ` linux-next: manual merge of the parisc tree with Linus' tree Kyle McMartin
2009-10-10 1:23 ` 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=20091009112158.7d37ed23.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dhowells@redhat.com \
--cc=kyle@mcmartin.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
/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