Hi Ingo,
Today's linux-next merge of the iommu tree got a conflict in
Documentation/kernel-parameters.txt between commit
8e141e0b33e2fd17540881a1ead5103dd229bf81 ("docum-kernprms-alpha3") from
the kernel-doc tree and commit 59d3daafa17265f01149df8eab3fb69b9b42cb2e
("dma-debug: add kernel command line parameters") from the iommu tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc Documentation/kernel-parameters.txt
index 114e162,0fa3c05..0000000
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -608,12 -684,8 +608,22 @@@ and is between 256 and 4096 characters
MTRR settings. This parameter disables that behavior,
possibly causing your machine to run very slowly.
+ disable_timer_pin_1 [i386,x86-64]
+ Disable PIN 1 of APIC timer
+ Can be useful to work around chipset bugs.
+
dmasound= [HW,OSS] Sound subsystem buffers
++ dma_debug=off If the kernel is compiled with DMA_API_DEBUG support
++ this option disables the debugging code at boot.
++
++ dma_debug_entries=<number>
++ This option allows to tune the number of preallocated
++ entries for DMA-API debugging code. One entry is
++ required per DMA-API allocation. Use this if the
++ DMA-API debugging code disables itself because the
++ architectural default is too low.
++
dscc4.setup= [NET]
dtc3181e= [HW,SCSI]
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
