linux-kernel - Re: linux-next: manual merge of the block tree with the 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <4C91B895.8090808@kernel.dk>
Date:	Thu, 16 Sep 2010 08:26:29 +0200
From:	Jens Axboe <axboe@...nel.dk>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jiri Slaby <jslaby@...e.cz>, Tejun Heo <tj@...nel.org>
Subject: Re: linux-next: manual merge of the block tree with the Linus' tree

On 2010-09-16 04:04, Stephen Rothwell wrote:
> Hi Jens,
> 
> Today's linux-next merge of the block tree got a conflict in
> drivers/block/loop.c between commit
> 5e00d1b5b4c10fb839afd5ce61db8e24339454b0 ("BLOCK: fix bio.bi_rw
> handling") from Linus' tree and commit
> 6259f28459a9de820f47a9ece4ffa22d4596a9af ("block/loop: implement
> REQ_FLUSH/FUA support") from the block tree.
> 
> I fixed it up (the latter removed the line that the former changed) and
> can carry the fix as necessary.

Thanks Stephen, I will merge in -git in for-next to resolve these
for you so you don't have to carry it.

-- 
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/