linux-kernel - Re: linux-next: manual merge of the s390 tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Fri, 20 May 2011 20:43:03 +0200
From:	Jens Axboe <jaxboe@...ionio.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Martin Schwidefsky <schwidefsky@...ibm.com>,
	Heiko Carstens <heiko.carstens@...ibm.com>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Tejun Heo <tj@...nel.org>
Subject: Re: linux-next: manual merge of the s390 tree with Linus' tree

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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/