From: Rusty Russell <rusty@rustcorp.com.au>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>
Subject: Re: linux-next: manual merge of the rr tree with the s390 tree
Date: Tue, 17 Mar 2009 13:15:36 +1030 [thread overview]
Message-ID: <200903171315.37237.rusty@rustcorp.com.au> (raw)
In-Reply-To: <20090317133527.306e4be1.sfr@canb.auug.org.au>
On Tuesday 17 March 2009 13:05:27 Stephen Rothwell wrote:
> 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.
Actually, they took my pull, and Martin mentioned a fix.
I'll drop my version from linux-next for tomorrow.
Thanks!
Rusty.
next prev parent reply other threads:[~2009-03-17 2:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-17 2:35 linux-next: manual merge of the rr tree with the s390 tree Stephen Rothwell
2009-03-17 2:45 ` Rusty Russell [this message]
2009-03-17 3:22 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
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=200903171315.37237.rusty@rustcorp.com.au \
--to=rusty@rustcorp.com.au \
--cc=heiko.carstens@de.ibm.com \
--cc=linux-next@vger.kernel.org \
--cc=schwidefsky@de.ibm.com \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.