The patch titled doc: fix oops-tracing duplicate has been added to the -mm tree. Its filename is doc-fix-oops-tracing-duplicate.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: doc: fix oops-tracing duplicate From: Michal Piotrowski <michal.k.k.piotrowski@xxxxxxxxx> Remove duplicate 'U' entry -- fix mis-merge. Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@xxxxxxxxx> Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/oops-tracing.txt | 3 --- 1 files changed, 3 deletions(-) diff -puN Documentation/oops-tracing.txt~doc-fix-oops-tracing-duplicate Documentation/oops-tracing.txt --- a/Documentation/oops-tracing.txt~doc-fix-oops-tracing-duplicate +++ a/Documentation/oops-tracing.txt @@ -234,9 +234,6 @@ characters, each representing a particul 6: 'B' if a page-release function has found a bad page reference or some unexpected page flags. - 7: 'U' if a user specifically requested that the Tainted flag be set, - ' ' otherwise. - 7: 'U' if a user or user application specifically requested that the Tainted flag be set, ' ' otherwise. _ Patches currently in -mm which might be from michal.k.k.piotrowski@xxxxxxxxx are git-ia64.patch git-input.patch git-kvm.patch i386-irq-kill-irq-compression.patch xfs-fix-unmount-race.patch doc-fix-oops-tracing-duplicate.patch extend-notifier_call_chain-to-count-nr_calls-made.patch revoke-special-mmap-handling-vs-fault-vs-invalidate.patch reiser4.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html