linux-kernel - linux-next: manual merge of the trivial tree with the tree

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: Windows password security audit tool. GUI, reports in PDF.

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

Message-Id: <20090731143912.7a6afdbb.sfr@canb.auug.org.au>
Date:	Fri, 31 Jul 2009 14:39:12 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Joe Perches <joe@...ches.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Markus Heidelberg <markus.heidelberg@....de>
Subject: linux-next: manual merge of the trivial tree with the  tree

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@...b.auug.org.au

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@...r.kernel.org
- 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@...ldses.org
 -P:	Neil Brown
 -M:	neilb@...e.de
 +M:	"J. Bruce Fields" <bfields@...ldses.org>
 +M:	Neil Brown <neilb@...e.de>
  L:	linux-nfs@...r.kernel.org
  W:	http://nfs.sourceforge.net/
  S:	Supported
--
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/