linux-kernel - [PATCH V2] MAINTAINERS: Update Kernel Janitors after mismerge

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Date:	Thu, 24 Sep 2009 16:07:22 -0700
From:	Joe Perches <joe@...ches.com>
To:	akpm@...ux-foundation.org
Cc:	mm-commits@...r.kernel.org, Jiri Kosina <jkosina@...e.cz>,
	Markus Heidelberg <markus.heidelberg@....de>,
	LKML <linux-kernel@...r.kernel.org>
Subject: [PATCH V2] MAINTAINERS: Update Kernel Janitors after mismerge

On Thu, 2009-09-24 at 14:42 -0700, akpm@...ux-foundation.org wrote:
> The patch titled
>      MAINTAINERS: JANITORS status set to Odd Fixes
> Subject: MAINTAINERS: JANITORS status set to Odd Fixes
> It was mistakenly reset to MAINTAINED after a fuzzy merge

This is a better patch.
It fixes the mismerge of the W: URL and the S: status fields.

Signed-off-by: Joe Perches <joe@...ches.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 0aa0776..ba70091 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2954,8 +2954,8 @@ F:	scripts/Makefile.*
 
 KERNEL JANITORS
 L:	kernel-janitors@...r.kernel.org
-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@...ldses.org>


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/