The patch titled MAINTAINERS: update Kernel Janitors after mismerge has been added to the -mm tree. Its filename is maintainers-update-kernel-janitors-after-mismerge.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: MAINTAINERS: update Kernel Janitors after mismerge From: Joe Perches <joe@xxxxxxxxxxx> Fix the mismerge of the W: URL and the S: status fields. Signed-off-by: Joe Perches <joe@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN MAINTAINERS~maintainers-update-kernel-janitors-after-mismerge MAINTAINERS --- a/MAINTAINERS~maintainers-update-kernel-janitors-after-mismerge +++ a/MAINTAINERS @@ -2980,8 +2980,8 @@ F: scripts/Makefile.* KERNEL JANITORS L: kernel-janitors@xxxxxxxxxxxxxxx -W: http://www.kerneljanitors.org/ -S: Maintained +W: http://janitor.kernelnewbies.org/ +S: Odd Fixes KERNEL NFSD, SUNRPC, AND LOCKD SERVERS M: "J. Bruce Fields" <bfields@xxxxxxxxxxxx> _ Patches currently in -mm which might be from joe@xxxxxxxxxxx are origin.patch linux-next.patch maintainers-update-generic-uio-for-pci-devices.patch maintainers-update-tracing-section.patch maintainers-update-omap-tony-lindgren-email-name.patch maintainers-change-atm-mailing-list-to-moderated.patch maintainers-use-tab-not-spaces-after-field-types.patch maintainers-update-kernel-janitors-after-mismerge.patch maintainers-update-score-architecture-name-style-and-add-file-pattern.patch maintainers-simple-firmware-interface-update-email-style.patch maintainers-winbond-cir-integrate-p-m-lines-fixup-david-härdemans-name.patch maintainers-fix-up-peripheral-spelling.patch maintainers-update-wolfson-microelectronics.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