linux-kernel - linux-next: manual merge of the akpm-current tree with the block 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>] [day] [month] [year] [list]

Message-ID: <20140702160631.240b44d0@canb.auug.org.au>
Date:	Wed, 2 Jul 2014 16:06:31 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>,
	Jens Axboe <axboe@...nel.dk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Maurizio Lombardi <mlombard@...hat.com>,
	Ming Lei <ming.lei@...onical.com>
Subject: linux-next: manual merge of the akpm-current tree with the block
 tree

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
block/bio.c between commit 254c4407cb84 ("bio: modify __bio_add_page()
to accept pages that don't start a new segment") from the block tree
and commit b5e51c564fb2 ("bio: modify __bio_add_page() to accept pages
that don't start a new segment") from the akpm-current tree.

I fixed it up (I used the version from the block tree) and can carry the
fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)