linux-kernel - linux-next: manual merge of the security tree with the ocfs2 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: <20110823135237.b2dcfdda5d3e0b6631997d36@canb.auug.org.au>
Date:	Tue, 23 Aug 2011 13:52:37 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	James Morris <jmorris@...ei.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Tiger Yang <tiger.yang@...cle.com>,
	Joel Becker <jlbec@...lplan.org>,
	Mimi Zohar <zohar@...ux.vnet.ibm.com>
Subject: linux-next: manual merge of the security tree with the ocfs2 tree

Hi James,

Today's linux-next merge of the security tree got a conflict in
fs/ocfs2/xattr.c between commit d27fb6a99c41 ("ocfs2: free memory
allocated by inode_init_security") from the ocfs2 tree and commit
9d8f13ba3f48 ("security: new security_inode_init_security API adds
function callback") from the security tree.

I assume that the latter supercedes the former, so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped