Hi all,

Today's linux-next merge of the rcu tree got a conflict in:

  Documentation/admin-guide/kernel-parameters.txt

between commit:

  5c5682b9f87a ("x86/cpu: Detect real BSP on crash kernels")

from the tip tree and commit:

  600716592a3a ("doc: Add EARLY flag to early-parsed kernel boot parameters")

from the rcu tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/admin-guide/kernel-parameters.txt
index fd1519ee44a0,3f894fbb4916..000000000000
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@@ -1099,7 -1101,16 +1100,7 @@@
  			Disable TLBIE instruction. Currently does not work
  			with KVM, with HASH MMU, or with coherent accelerators.
  
- 	disable_ddw	[PPC/PSERIES]
 -	disable_cpu_apicid= [X86,APIC,SMP]
 -			Format: <int>
 -			The number of initial APIC ID for the
 -			corresponding CPU to be disabled at boot,
 -			mostly used for the kdump 2nd kernel to
 -			disable BSP to wake up multiple CPUs without
 -			causing system reset or hang due to sending
 -			INIT from AP to BSP.
 -
+ 	disable_ddw	[PPC/PSERIES,EARLY]
  			Disable Dynamic DMA Window support. Use this
  			to workaround buggy firmware.
  
@@@ -1744,18 -1749,7 +1745,18 @@@
  				(that will set all pages holding image data
  				during restoration read-only).
  
 +	hibernate.compressor= 	[HIBERNATION] Compression algorithm to be
 +				used with hibernation.
 +				Format: { lzo | lz4 }
 +				Default: lzo
 +
 +				lzo: Select LZO compression algorithm to
 +				compress/decompress hibernation image.
 +
 +				lz4: Select LZ4 compression algorithm to
 +				compress/decompress hibernation image.
 +
- 	highmem=nn[KMG]	[KNL,BOOT] forces the highmem zone to have an exact
+ 	highmem=nn[KMG]	[KNL,BOOT,EARLY] forces the highmem zone to have an exact
  			size of <nn>. This works even on boxes that have no
  			highmem otherwise. This also works to reduce highmem
  			size on bigger boxes.