linux-next: build failure after merge of the cifs tree

[Stephen Rothwell]

Hi all,

After merging the cifs tree, today's linux-next build (powerpc
allyesconfig) failed like this:

ld: fs/cifsd/spnego_negtokeninit.asn1.o:(.rodata.spnego_negtokeninit_decoder+0x0): multiple definition of `spnego_negtokeninit_decoder'; fs/cifs/spnego_negtoken
init.asn1.o:(.rodata.spnego_negtokeninit_decoder+0x0): first defined here
ld: fs/cifsd/asn1.o:(.opd+0xa8): multiple definition of `gssapi_this_mech'; fs/cifs/asn1.o:(.opd+0x18): first defined here
ld: fs/cifsd/asn1.o: in function `.gssapi_this_mech':
asn1.c:(.text.gssapi_this_mech+0x0): multiple definition of `.gssapi_this_mech'; fs/cifs/asn1.o:asn1.c:(.text.gssapi_this_mech+0x0): first defined here
ld: fs/cifsd/asn1.o:(.opd+0xc0): multiple definition of `neg_token_init_mech_type'; fs/cifs/asn1.o:(.opd+0x30): first defined here
ld: fs/cifsd/asn1.o: in function `.neg_token_init_mech_type':
asn1.c:(.text.neg_token_init_mech_type+0x0): multiple definition of `.neg_token_init_mech_type'; fs/cifs/asn1.o:asn1.c:(.text.neg_token_init_mech_type+0x0): first defined here

Caused by commit

  4a957ba6daf6 ("cifs: decoding negTokenInit with generic ASN1 decoder")

interacting with commit

  fad4161b5cd0 ("cifsd: decoding gss token using lib/asn1_decoder.c")

from the cifsd tree.

I have reverted that cifs tree commit for today.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpSxg0EfisGM.pgp
Description: OpenPGP digital signature