On Mon, 17 Nov 2008, Stephen Rothwell wrote:
> Hi James,
>
> Today's linux-next merge of the security-testing tree got a conflict in
> fs/cifs/misc.c between commit 14fbf50d695207754daeb96270b3027a3821121f
> ("cifs: reinstate sharing of SMB sessions sans races") from the cifs tree
> and commit a001e5b558f25eb1e588522d73ac949b643b7a37 ("CRED: Wrap task
> credential accesses in the CIFS filesystem") from the security-testing
> tree.
>
> I fixed it up (see below) and can carry it for a short while.
I merged with linus to resolve this, in
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next
commit f3a5c547012a09f38f7c27b17a8e3150b69cd259
Please test.
- James
--
James Morris
<jmorris@xxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
