Stephen Rothwell wrote: > Hi Randy, > > Today's linux-next merge of the kernel-doc tree got a conflict in > Documentation/kernel-parameters.txt between commits > b9ce08c01020eb28bfbfa6faf1c740281c5f418e ("kmemtrace: Core > implementation") fron the tracing tree and > b98103a5597b87211a1c74077b06faeac554bedc ("x86: hpet: print HPET > registers during setup (if hpet=verbose is used)") from the timers tree > and commit 8e141e0b33e2fd17540881a1ead5103dd229bf81 > ("docum-kernprms-alpha3") from the kernel-doc tree. > > I fixed it up (see below) and can carry the fix as necessary. Sounds good. Thanks. -- ~Randy -- 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