[2.6 patch] GIT trivial tree

[2.6 patch] GIT trivial tree

[Adrian Bunk]

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(-)

diff --git a/CREDITS b/CREDITS
index 5b1edf3..7fb4c73 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3642,11 +3642,9 @@ S: Beaverton, OR 97005
 S: USA
 
 N: Michal Wronski
-E: wrona@mat.uni.torun.pl
-W: http://www.mat.uni.torun.pl/~wrona
+E: Michal.Wronski@motorola.com
 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
diff --git a/MAINTAINERS b/MAINTAINERS
index d57c491..08dd21f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2455,10 +2455,10 @@ L:	linux-kernel@vger.kernel.org
 S:	Maintained
 
 TRIVIAL PATCHES
-P:      Rusty Russell
-M:      trivial@rustcorp.com.au
+P:      Adrian Bunk
+M:      trivial@kernel.org
 L:      linux-kernel@vger.kernel.org
-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
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index a0f18c9..c8943b5 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -2,7 +2,7 @@
  * POSIX message queues filesystem for Linux.
  *
  * Copyright (C) 2003,2004  Krzysztof Benedyczak    (golbi@mat.uni.torun.pl)
- *                          Michal Wronski          (wrona@mat.uni.torun.pl)
+ *                          Michal Wronski          (Michal.Wronski@motorola.com)
  *
  * Spinlocks:               Mohamed Abbas           (abbas.mohamed@intel.com)
  * Lockless receive & send, fd based notify:

Re: [2.6 patch] GIT trivial tree

[Linus Torvalds]

On Mon, 7 Nov 2005, Adrian Bunk wrote:
> 
>   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

> 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

Re: [2.6 patch] GIT trivial tree

[Adrian Bunk]

On Mon, Nov 07, 2005 at 09:02:29AM -0800, Linus Torvalds wrote:
> 
> 
> On Mon, 7 Nov 2005, Adrian Bunk wrote:
> > 
> >   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.

OK, I'll try to get this right the next time.

> 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
> 
> > 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).
>...

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.

> 		Linus

cu
Adrian

-- 

       "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