Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in fs/nfs/client.c
between commit 074b1d12fe25 ("NFSv4: Change the default setting of the
nfs4_disable_idmapping parameter") from the nfs tree and commit
5a925e82e106 ("module_param: make bool parameters really bool (drivers &
misc)") from the rr tree.
I fixed it up (see below) and can carry the fix as necessary.
Rusty: shouldn't bools be initialise with true/false instead of 1/0?
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc fs/nfs/client.c
index 277dfaf,4a092a0..0000000
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@@ -84,7 -84,7 +84,7 @@@ retry
/*
* Turn off NFSv4 uid/gid mapping when using AUTH_SYS
*/
- static int nfs4_disable_idmapping = 1;
-static bool nfs4_disable_idmapping = 0;
++static bool nfs4_disable_idmapping = 1;
/*
* RPC cruft for NFS
Attachment:
pgpYDBJdR0KVp.pgp
Description: PGP signature
