GIT trivial tree
PATCH 1/1 GIT trivial tree
Linus, please do an update from:
http://www.kernel.org/pub/scm/linux/kernel/git/bunk/trivial.git
I've taken over the trivial patch monkey from Rusty, and I'll send the really trivial patches like spelling corrections through this tree.
Is this tree OK or are there any problems with it?
Full patches currently in the tree below.
Adrian Bunk:
I am the new monkey.
Merge with http://www.kernel.org/.../torvalds/linux-2.6.git
Michal Wronski:
Update Michal Wronski contact info
CREDITS | 6 ++---- MAINTAINERS | 6 +++--- ipc/mqueue.c | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-)
CREDITS +2 -4
@@ -3642,11 +3642,9 @@ S: Beaverton, OR 97005 S: USA N: Michal Wronski -E: [email protected] -W: http://www.mat.uni.torun.pl/~wrona +E: [email protected] D: POSIX message queues fs (with K. Benedyczak) -S: ul. Teczowa 23/12 -S: 80-680 Gdansk-Sobieszewo +S: Krakow S: Poland N: Frank Xia
MAINTAINERS +3 -3
@@ -2455,10 +2455,10 @@ L: [email protected] S: Maintained TRIVIAL PATCHES -P: Rusty Russell -M: [email protected] +P: Adrian Bunk +M: [email protected] L: [email protected] -W: http://www.kernel.org/pub/linux/kernel/people/rusty/trivial/ +W: http://www.kernel.org/pub/linux/kernel/people/bunk/trivial/ S: Maintained TMS380 TOKEN-RING NETWORK DRIVER
ipc/mqueue.c +1 -1
@@ -2,7 +2,7 @@* POSIX message queues filesystem for Linux. * * Copyright (C) 2003,2004 Krzysztof Benedyczak ([email protected]) -* Michal Wronski ([email protected]) +* Michal Wronski ([email protected]) * * Spinlocks: Mohamed Abbas ([email protected]) * Lockless receive & send, fd based notify:
Quoted 2 lines · Adrian Bunk
http://www.kernel.org/pub/scm/linux/kernel/git/bunk/trivial.git
Please don't try to make me update over http. Either point to master (which is not accessible by all), or point to git://git.kernel.org/. Or do both..
And if you do the latter (or, in fact, rsync or http for others), please make sure that you delay your "please pull" sufficiently that the contents have actually mirrored out, because otherwise, if the mail comes in while I'm in merging mode (like right now), and I try to pull, I may not have anything to pull at all just because it hasn't mirrored out yet.
A side comment (this was true with BK too): I prefer not to see unnecessary two-way merges, since that just makes the history much messier. So
Quoted 2 lines
Adrian Bunk:
Merge with http://www.kernel.org/.../torvalds/linux-2.6.git
is _probably_ unnecessary, since by definition the "trivial" tree should basically never have anything that could cause clashes (so if I just pull on it, it should merge fine even without you doing the merge the other way).
Anyway, I pulled, but now we have two merges instead of one, which is kind of pointless and unnecessary history complexity.
Linus
Quoted 10 lines · Linus Torvalds
Quoted 2 lines · Adrian Bunk
http://www.kernel.org/pub/scm/linux/kernel/git/bunk/trivial.git
Please don't try to make me update over http. Either point to master (which is not accessible by all), or point to
git://git.kernel.org/. Or do both..
Quoted 5 lines
And if you do the latter (or, in fact, rsync or http for others), please make sure that you delay your "please pull" sufficiently that the contents have actually mirrored out, because otherwise, if the mail comes in while I'm in merging mode (like right now), and I try to pull, I may not have anything to pull at all just because it hasn't mirrored out yet.
OK, I'll try to get this right the next time.
Quoted 4 lines
A side comment (this was true with BK too): I prefer not to see unnecessary two-way merges, since that just makes the history much messier. So
Quoted 8 lines
Quoted 2 lines
Adrian Bunk:
Merge with http://www.kernel.org/.../torvalds/linux-2.6.gitis _probably_ unnecessary, since by definition the "trivial" tree should basically never have anything that could cause clashes (so if I just pull on it, it should merge fine even without you doing the merge the other way).
...
Petr (who had already given me a "git for dummies" course yesterday) has explained to me why this happened, and it shouldn't happen again.
Quoted 1 line
Linus
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed