From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jiri Kosina <jkosina@suse•cz>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Joe Perches <joe@perches•com>,
Andrew Morton <akpm@linux-foundation•org>,
Markus Heidelberg <markus.heidelberg@web•de>
Subject: linux-next: manual merge of the trivial tree with the tree
Date: Fri, 31 Jul 2009 14:39:12 +1000 [thread overview]
Message-ID: <20090731143912.7a6afdbb.sfr@canb.auug.org.au> (raw)
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@canb•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@vger•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@fieldses•org
-P: Neil Brown
-M: neilb@suse•de
+M: "J. Bruce Fields" <bfields@fieldses•org>
+M: Neil Brown <neilb@suse•de>
L: linux-nfs@vger•kernel.org
W: http://nfs.sourceforge.net/
S: Supported
next reply other threads:[~2009-07-31 4:39 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-31 4:39 Stephen Rothwell [this message]
2009-08-08 0:13 ` linux-next: manual merge of the trivial tree with the tree Jiri Kosina
2009-08-08 0:46 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2012-05-22 4:54 Stephen Rothwell
2012-05-22 9:16 ` Jiri Kosina
2012-05-22 11:53 ` John Crispin
2011-06-14 4:31 Stephen Rothwell
2011-06-14 8:42 ` Jiri Kosina
2011-06-14 4:25 Stephen Rothwell
2010-11-09 2:27 Stephen Rothwell
2010-11-19 16:08 ` Jiri Kosina
2010-02-08 4:48 Stephen Rothwell
2010-02-08 4:49 ` Stephen Rothwell
2010-02-09 10:01 ` Jiri Kosina
2009-11-09 4:43 Stephen Rothwell
2009-11-09 8:45 ` Jiri Kosina
2009-11-09 15:08 ` Bartlomiej Zolnierkiewicz
2009-11-09 15:25 ` Jiri Kosina
2009-03-12 4:43 Stephen Rothwell
2009-03-12 10:27 ` Jiri Kosina
2009-02-04 6:59 Stephen Rothwell
2009-02-05 12:59 ` Jiri Kosina
2009-02-05 22:23 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090731143912.7a6afdbb.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=jkosina@suse$(echo .)cz \
--cc=joe@perches$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=markus.heidelberg@web$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox