linux-next: cifs tree build failures

Hi all,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

fs/cifs/cifsfs.c: In function 'init_cifs':
fs/cifs/cifsfs.c:1047: error: implicit declaration of function 'unregister_key_type'

Caused by commit 3bc303c254335dbd7c7012cc1760b12f1d5514d3 ("cifs: convert
oplock breaks to use slow_work facility (try #4)") exposing the call to
unregister_key_type() even if CONFIG_KEYS is not set.

fs/cifs/file.c: In function 'cifs_open':
fs/cifs/file.c:401: warning: passing argument 4 of 'cifs_new_fileinfo' from incompatible pointer type
fs/cifs/cifsproto.h:94: note: expected 'struct cifsTconInfo *' but argument is of type 'struct vfsmount *'
fs/cifs/dir.c:134: error: conflicting types for 'cifs_new_fileinfo'
fs/cifs/cifsproto.h:94: note: previous declaration of 'cifs_new_fileinfo' was here

Caused by commit 086f68bd97126618ecb2dcff5f766f3a21722df7 ("cifs:
eliminate cifs_init_private") which gives a different prototype for
cifs_new_fileinfo() in fs/cifs/cifsproto.h to the definition in
fs/cifs/dir.c.

This needs more care ...

I have reverted both those commits for today.
-- 
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAkq8BekACgkQjjKRsyhoI8yqxgCfaFPgxlNpe/TleLspBi24dpMX
wLsAn0ImyG5uBAcIyQD16FRbNCfpjGCS
=h5E6
-----END PGP SIGNATURE-----