From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Martin Schwidefsky <schwidefsky@de•ibm.com>,
Heiko Carstens <heiko.carstens@de•ibm.com>,
linux-next@vger•kernel.org, Kay Sievers <kay.sievers@vrfy•org>
Subject: Re: linux-next: manual merge of the s390 tree
Date: Mon, 23 Jun 2008 21:27:32 -0700 [thread overview]
Message-ID: <20080624042732.GA32107@kroah.com> (raw)
In-Reply-To: <20080624134546.c8ac496d.sfr@canb.auug.org.au>
On Tue, Jun 24, 2008 at 01:45:46PM +1000, Stephen Rothwell wrote:
> Hi Martin, Greg,
>
> Today's linux-next merge of the s390 tree got a conflict in
> drivers/s390/cio/qdio.c between commit
> 4836b98e1d4c0b5e86ce4e071321367cf28885c4 ("s390: bus_id -> dev_name
> conversions") from the driver-core tree and commit
> bc3817177fc931f0ade32808e4cb61be2f0999fb ("[S390] qdio: Repair timeout
> handling for qdio_shutdown") from the s390 tree.
>
> It is a simple near overlap of changes, and I fixed it up. I can carry
> the fixup.
Great, thanks for doing this.
greg k-h
next prev parent reply other threads:[~2008-06-24 4:29 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-24 3:45 linux-next: manual merge of the s390 tree Stephen Rothwell
2008-06-24 4:27 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-07-01 4:43 Stephen Rothwell
2008-10-29 0:06 Stephen Rothwell
2008-11-19 23:13 Stephen Rothwell
2008-11-20 11:10 ` Martin Schwidefsky
2008-11-20 11:57 ` Stephen Rothwell
2008-12-01 22:39 Stephen Rothwell
2008-12-02 8:12 ` Martin Schwidefsky
2008-12-02 22:09 ` 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=20080624042732.GA32107@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=heiko.carstens@de$(echo .)ibm.com \
--cc=kay.sievers@vrfy$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=schwidefsky@de$(echo .)ibm.com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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