[CIFS] merge conflict in fs/cifs/export.c