Hi Catalin,

Today's linux-next merge of the kmemleak tree got a conflict in
Documentation/kernel-parameters.txt between commit
f7e346e78be0c021495e9e21a0261903177aaecc ("docum-kernprms-alpha3") from
the kernel-doc tree and commit 3f4883f9b04c1b48effc7b3050b2f83ab8e056b9
("kmemleak: Add documentation on the memory leak detector") from the
kmemleak tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc Documentation/kernel-parameters.txt
index 9f574c7,f148662..0000000

--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt

@@@ -1020,18 -1067,10 +1020,22 @@@ and is between 256 and 4096 characters
  			Configure the RouterBoard 532 series on-chip
  			Ethernet adapter MAC address.
  
+ 	kmemleak=	[KNL] Boot-time kmemleak enable/disable
+ 			Valid arguments: on, off
+ 			Default: on
+ 
 +	kmemtrace.enable=	[KNL,KMEMTRACE] Format: { yes | no }
 +				Controls whether kmemtrace is enabled
 +				at boot-time.
 +
 +	kmemtrace.subbufs=n	[KNL,KMEMTRACE] Overrides the number of
 +			subbufs kmemtrace's relay channel has. Set this
 +			higher than default (KMEMTRACE_N_SUBBUFS in code) if
 +			you experience buffer overruns.
 +
 +	kstack=N	[X86-32,X86-64] Print N words from the kernel stack
 +			in oops dumps.
 +
  	l2cr=		[PPC]
  
  	l3cr=		[PPC]