From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Martin Schwidefsky <schwidefsky@de.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Tejun Heo <tj@kernel.org>, Jens Axboe <jaxboe@fusionio.com>
Subject: linux-next: manual merge of the s390 tree with Linus' tree
Date: Thu, 19 May 2011 10:35:39 +1000 [thread overview]
Message-ID: <20110519103539.aa1b5094.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 491 bytes --]
Hi all,
Today's linux-next merge of the s390 tree got a conflict in
drivers/s390/char/tape_block.c between commit 9fd097b14918 ("block:
unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers") from Linus'
tree and commit 263fa17de50e ("[S390] Remove tape block device driver")
from the s390 tree.
The latter just removes the file updated by the former. So I did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2011-05-19 0:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-19 0:35 Stephen Rothwell [this message]
2011-05-20 18:43 ` linux-next: manual merge of the s390 tree with Linus' tree Jens Axboe
2015-02-22 0:27 Stephen Rothwell
2015-04-20 2:02 Stephen Rothwell
2017-09-03 23:49 Stephen Rothwell
2017-09-04 12:45 ` Martin Schwidefsky
2020-05-29 0:10 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=20110519103539.aa1b5094.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=heiko.carstens@de.ibm.com \
--cc=jaxboe@fusionio.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=schwidefsky@de.ibm.com \
--cc=tj@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;
as well as URLs for NNTP newsgroup(s).