linux-next: manual merge of the security-testing tree

To:	James Morris <jmorris@xxxxxxxxx>
Subject:	linux-next: manual merge of the security-testing tree
From:	Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date:	Tue, 2 Dec 2008 15:06:33 +1100
Cc:	linux-next@xxxxxxxxxxxxxxx, Christoph Hellwig <hch@xxxxxxxxxxxxx>, Tim Shimmin <tes@xxxxxxx>, David Chinner <david@xxxxxxxxxxxxx>, Lachlan McIlroy <lachlan@xxxxxxx>, xfs-masters@xxxxxxxxxxx, David Howells <dhowells@xxxxxxxxxx>

Hi James,

Today's linux-next merge of the security-testing tree got a conflict in
fs/xfs/xfs_vnodeops.h between commit
ea5a3dc8356bf1cf27bab9a5a0da5dfbbb82013d ("[XFS] kill sys_cred") from the
xfs tree and commit b6dff3ec5e116e3af6f537d4caedcad6b9e5082a ("CRED:
Separate task security context from task_struct") from the
security-testing tree.

I fixed it up (by using the xfs tree version - since that removed the
parameters that the latter changed) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

pgp54QjPnzuRc.pgp
Description: PGP signature

<Prev in Thread]	Current Thread	[Next in Thread>
linux-next: manual merge of the security-testing tree, Stephen Rothwell <= linux-next: manual merge of the security-testing tree, Stephen Rothwell

Next by Date:	[Bug 803] New: xfs_repair 2.10.1 finds errors which it cannot repair, bugzilla-daemon
Next by Thread:	linux-next: manual merge of the security-testing tree, Stephen Rothwell
Indexes:	[Date] [Thread] [Top] [All Lists]