From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rusty Russell <rusty@rustcorp.com.au>
Cc: linux-next@vger.kernel.org,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>
Subject: linux-next: manual merge of the rr tree with the s390 tree
Date: Tue, 17 Mar 2009 13:35:27 +1100 [thread overview]
Message-ID: <20090317133527.306e4be1.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 517 bytes --]
Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
arch/s390/include/asm/tlbflush.h between commit
e6f19dbd10f5d871750ee3fb03e2e99a06eebf92 ("[S390] cpumask: use mm_cpumask
() wrapper") from the s390 tree and commit
49797d75185490d793bd5bd5db50f143ee8c9d89 ("cpumask:use-mm_cpumask-s390")
from the rr tree.
I assumed that the rr tree version was the correct version and used that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2009-03-17 2:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-17 2:35 Stephen Rothwell [this message]
2009-03-17 2:45 ` linux-next: manual merge of the rr tree with the s390 tree Rusty Russell
2009-03-17 3:22 ` Stephen Rothwell
2012-08-06 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=20090317133527.306e4be1.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=heiko.carstens@de.ibm.com \
--cc=linux-next@vger.kernel.org \
--cc=rusty@rustcorp.com.au \
--cc=schwidefsky@de.ibm.com \
/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).