From: Martin Schwidefsky <schwidefsky@de.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>,
linux-next@vger.kernel.org,
David Gibson <david@gibson.dropbear.id.au>,
Paul Mackerras <paulus@samba.org>,
Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Subject: Re: linux-next: manual merge of the s390 tree
Date: Thu, 20 Nov 2008 12:10:14 +0100 [thread overview]
Message-ID: <1227179414.23671.1.camel@localhost> (raw)
In-Reply-To: <20081120101309.0553d091.sfr@canb.auug.org.au>
On Thu, 2008-11-20 at 10:13 +1100, Stephen Rothwell wrote:
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix. The conflict could be eliminated by one of the two sets of changes
> moving slightly in the files (I am hinting about the s390 ones here as
> Paul does not like rebasing his tree ...).
Ok, done. I moved the HCV_ICUV option before HVC_BEAT.
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
next prev parent reply other threads:[~2008-11-20 11:12 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-19 23:13 linux-next: manual merge of the s390 tree Stephen Rothwell
2008-11-20 11:10 ` Martin Schwidefsky [this message]
2008-11-20 11:57 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-12-01 22:39 Stephen Rothwell
2008-12-02 8:12 ` Martin Schwidefsky
2008-12-02 22:09 ` Stephen Rothwell
2008-10-29 0:06 Stephen Rothwell
2008-07-01 4:43 Stephen Rothwell
2008-06-24 3:45 Stephen Rothwell
2008-06-24 4:27 ` Greg KH
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=1227179414.23671.1.camel@localhost \
--to=schwidefsky@de.ibm.com \
--cc=brueckner@linux.vnet.ibm.com \
--cc=david@gibson.dropbear.id.au \
--cc=heiko.carstens@de.ibm.com \
--cc=linux-next@vger.kernel.org \
--cc=paulus@samba.org \
--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.