* linux-next: manual merge of the rr tree with the nfs tree
@ 2012-01-10 2:47 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2012-01-10 2:47 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-next, linux-kernel, Trond Myklebust
[-- Attachment #1: Type: text/plain, Size: 908 bytes --]
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@canb.auug.org.au
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 #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-01-10 2:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-10 2:47 linux-next: manual merge of the rr tree with the nfs tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).