From: Jens Axboe <jaxboe@fusionio.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" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Tejun Heo <tj@kernel.org>
Subject: Re: linux-next: manual merge of the s390 tree with Linus' tree
Date: Fri, 20 May 2011 20:43:03 +0200 [thread overview]
Message-ID: <4DD6B637.3060509@fusionio.com> (raw)
In-Reply-To: <20110519103539.aa1b5094.sfr@canb.auug.org.au>
On 2011-05-19 02:35, Stephen Rothwell wrote:
> 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.
That works, thanks. The other fixup you are carrying should be gone now,
I had to pull in 2.6.39 final to resolve other conflicts.
--
Jens Axboe
next prev parent reply other threads:[~2011-05-20 18:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-19 0:35 linux-next: manual merge of the s390 tree with Linus' tree Stephen Rothwell
2011-05-20 18:43 ` Jens Axboe [this message]
-- strict thread matches above, loose matches on Subject: below --
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
2025-01-29 0:59 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=4DD6B637.3060509@fusionio.com \
--to=jaxboe@fusionio.com \
--cc=heiko.carstens@de.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=schwidefsky@de.ibm.com \
--cc=sfr@canb.auug.org.au \
--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 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.