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

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

Date:	Mon, 3 Dec 2012 12:04:29 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Nicholas A. Bellinger" <nab@...ux-iscsi.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Roland Dreier <roland@...estorage.com>,
	Christoph Hellwig <hch@...radead.org>
Subject: linux-next: manual merge of the target-updates tree with Linus'
 tree

Hi Nicholas,

Today's linux-next merge of the target-updates tree got a conflict in
drivers/target/target_core_transport.c between commit 3ea160b3e8f0
("target: Fix handling of aborted commands") from Linus' tree and commit
019c4ca62148 ("target: kill dev->dev_task_attr_type") from the
target-updates tree.

I just use the target-updates tree version and can carry the fix as
necessary (no action is required).

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

Content of type "application/pgp-signature" skipped