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]

Message-ID: <20150601210540.6ed03c8a@canb.auug.org.au>
Date:	Mon, 1 Jun 2015 21:05:40 +1000
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,
	Christoph Hellwig <hch@....de>
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_pr.c between commit d588cf8f618d (target:
Fix se_tpg_tfo->tf_subsys regression + remove tf_subsystem"") from
Linus' tree and commits c6eec4d58f5d ("target: remove tf_subsystem
pointers") and 293f3c05b01a ("target: Convert
se_node_acl->device_list[] to RCU hlist") from the target-updates tree.

I fixed it up (again, the first of the target-updates trees patches is
a subset of the one in Linus' tree) 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