Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
MAINTAINERS between commit 24725d1ecf26ba05d74c1cc3ae7467b61a900421
("MAINTAINERS: Update KERNEL JANITORS") from Linus' tree and commit
70301b8cc8a23d57d3e6120c012c86569285efcb ("trivial: update the Kernel
Janitors' web-page URL") from the trivial tree.
Just context differences. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc MAINTAINERS
index fa86fd5,354cc16..0000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2912,13 -3374,16 +2912,13 @@@ F: Makefil
F: scripts/Makefile.*
KERNEL JANITORS
-P: Several
L: kernel-janitors@xxxxxxxxxxxxxxx
- W: http://www.kerneljanitors.org/
+ W: http://janitor.kernelnewbies.org/
-S: Maintained
+S: Odd fixes
KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
-P: J. Bruce Fields
-M: bfields@xxxxxxxxxxxx
-P: Neil Brown
-M: neilb@xxxxxxx
+M: "J. Bruce Fields" <bfields@xxxxxxxxxxxx>
+M: Neil Brown <neilb@xxxxxxx>
L: linux-nfs@xxxxxxxxxxxxxxx
W: http://nfs.sourceforge.net/
S: Supported
--
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
