From: u.kleine-koenig@pengutronix.de (Uwe Kleine-König)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] omap changes for v2.6.39 merge window
Date: Fri, 18 Mar 2011 12:13:19 +0100 [thread overview]
Message-ID: <20110318111319.GB27124@pengutronix.de> (raw)
In-Reply-To: <20110318101512.GA15375@n2100.arm.linux.org.uk>
Hello Russell,
On Fri, Mar 18, 2011 at 10:15:12AM +0000, Russell King - ARM Linux wrote:
> On Thu, Mar 17, 2011 at 07:50:36PM -0700, Linus Torvalds wrote:
> > The pure amount of crazy churn is annoying in itself,
> > but when I then get these "independent" pull requests from four
> > different people, and they touch the same files, that indicates that
> > something is wrong.
>
> I have already complained to Uwe and Sascha about the IMX/MXC conflicts.
> It already struck me that there's something seriously wrong at
> pengutronix.com as both Uwe and Sascha work in the same area, yet don't
> coordinate their efforts. It seems to me that Uwe is completely
> independent of everyone else.
I feel blamed wrongly here. My part of the "crazy churn" in
v2.6.38..$todayslinus/master is that I touched drivers/net/Kconfig[1] and
arch/arm/mach-mxs/gpio.c[2]. The former went in via the net tree; the
latter via Russell's tree with Sascha's Ack. Please correct me if I'm
wrong but I think this was the correct thing to do. I don't know how
that qualifies as "completely independent of everyone else".
IMHO the cooperation between Sascha and me works fine. In fact nearly
all[3] of my patches that touch imx related things under arch/arm/ go in
via Sascha's tree.
Best regards
Uwe
[1] 085e79e (net/fec: consolidate all i.MX options to CONFIG_ARM)
[2] bf0c111 (ARM: 6744/1: mxs: irq_data conversion)
[3] Some exceptions I found are:
bf0c111 ARM: 6744/1: mxs: irq_data conversion
4df772d ARM: 6322/1: imx/pca100: Fix name of spi platform data
868003c ARM: 6280/1: imx: Fix build failure when including <mach/gpio.h> without <linux/spinlock.h>
All of these are OK IMHO.
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
next prev parent reply other threads:[~2011-03-18 11:13 UTC|newest]
Thread overview: 161+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-17 18:30 [GIT PULL] omap changes for v2.6.39 merge window Tony Lindgren
2011-03-18 2:50 ` Linus Torvalds
2011-03-18 7:06 ` Tony Lindgren
2011-03-18 10:15 ` Russell King - ARM Linux
2011-03-18 11:13 ` Uwe Kleine-König [this message]
2011-03-30 17:06 ` Arnd Bergmann
2011-03-30 19:21 ` Linus Torvalds
2011-03-30 20:41 ` Nicolas Pitre
2011-03-30 21:02 ` Linus Torvalds
2011-03-30 23:31 ` Nicolas Pitre
2011-03-30 23:59 ` Russell King - ARM Linux
2011-03-31 0:15 ` Tony Lindgren
2011-03-31 0:31 ` Bill Gatliff
2011-03-31 0:39 ` david at lang.hm
2011-03-31 3:17 ` Nicolas Pitre
2011-03-31 3:29 ` Dave Airlie
2011-03-31 4:38 ` Nicolas Pitre
2011-03-31 9:54 ` Alan Cox
2011-03-31 10:50 ` Russell King - ARM Linux
2011-03-31 12:23 ` Jean-Christophe PLAGNIOL-VILLARD
2011-03-31 12:38 ` Catalin Marinas
2011-03-31 13:01 ` Russell King - ARM Linux
2011-03-31 14:55 ` Bill Gatliff
2011-04-01 12:41 ` Arnd Bergmann
2011-03-31 18:12 ` Sam Ravnborg
2011-03-31 18:17 ` Russell King - ARM Linux
2011-03-31 18:34 ` Jesse Barnes
2011-03-31 13:54 ` Thomas Gleixner
2011-03-31 17:22 ` david at lang.hm
2011-03-31 18:08 ` Koen Kooi
2011-03-31 5:05 ` david at lang.hm
2011-03-31 7:15 ` Nicolas Pitre
2011-03-31 8:06 ` Ingo Molnar
2011-03-31 8:30 ` Russell King - ARM Linux
2011-03-31 10:41 ` Ingo Molnar
2011-03-31 13:25 ` Russell King - ARM Linux
2011-03-31 12:04 ` Thomas Gleixner
2011-03-31 14:43 ` Kevin Hilman
2011-03-31 15:01 ` Thomas Gleixner
2011-03-31 15:05 ` Russell King - ARM Linux
2011-03-31 15:45 ` david at lang.hm
2011-03-31 15:23 ` Arnd Bergmann
2011-03-31 16:58 ` Thomas Gleixner
2011-03-31 18:23 ` Nicolas Pitre
2011-03-31 18:55 ` Thomas Gleixner
2011-04-01 11:32 ` Arnd Bergmann
2011-03-31 20:35 ` Kevin Hilman
2011-04-01 11:29 ` Arnd Bergmann
2011-04-01 7:32 ` Tomi Valkeinen
2011-04-01 11:22 ` Arnd Bergmann
2011-04-01 11:55 ` Tomi Valkeinen
2011-04-01 12:07 ` Arnd Bergmann
2011-04-01 12:15 ` Tomi Valkeinen
2011-03-31 16:03 ` david at lang.hm
2011-03-31 16:45 ` Russell King - ARM Linux
2011-03-31 17:17 ` Linus Torvalds
2011-03-31 19:25 ` Nicolas Pitre
2011-03-31 20:05 ` Linus Torvalds
2011-03-31 20:28 ` Linus Torvalds
2011-03-31 22:49 ` Nicolas Pitre
2011-04-01 0:53 ` Mark Brown
2011-04-01 4:50 ` David Brown
2011-04-01 7:45 ` Ingo Molnar
2011-04-01 13:54 ` Arnd Bergmann
2011-04-01 14:28 ` Detlef Vollmann
2011-04-01 14:59 ` Arnd Bergmann
2011-04-01 15:30 ` Detlef Vollmann
2011-04-01 15:50 ` Arnd Bergmann
2011-04-01 17:44 ` Russell King - ARM Linux
2011-04-01 19:54 ` Nicolas Pitre
2011-04-01 21:00 ` Uwe Kleine-König
2011-04-01 22:08 ` Arnd Bergmann
2011-04-02 2:24 ` Nicolas Pitre
2011-04-03 15:26 ` Arnd Bergmann
2011-04-03 16:03 ` Russell King - ARM Linux
2011-04-04 0:59 ` Arnd Bergmann
2011-04-04 8:26 ` Marc Zyngier
2011-04-04 11:03 ` Catalin Marinas
2011-04-04 11:21 ` Russell King - ARM Linux
2011-04-04 13:24 ` Marc Zyngier
2011-04-04 13:31 ` Russell King - ARM Linux
2011-04-04 13:57 ` Marc Zyngier
2011-04-04 20:08 ` Linus Walleij
2011-04-05 6:40 ` Santosh Shilimkar
2011-04-05 7:45 ` Russell King - ARM Linux
2011-04-05 14:15 ` Catalin Marinas
2011-04-05 22:16 ` Linus Walleij
2011-04-06 6:43 ` Santosh Shilimkar
2011-04-05 22:22 ` Linus Walleij
2011-04-06 6:41 ` Santosh Shilimkar
2011-04-05 7:30 ` Marc Zyngier
2011-05-26 13:38 ` Pavel Machek
2011-04-02 2:59 ` Mark Brown
2011-04-04 5:16 ` Jean-Christophe PLAGNIOL-VILLARD
2011-04-04 9:27 ` Nicolas Ferre
2011-04-01 21:10 ` Kevin Hilman
2011-04-01 21:32 ` Arnd Bergmann
2011-04-01 21:51 ` Catalin Marinas
2011-04-03 22:18 ` Benjamin Herrenschmidt
2011-04-04 0:14 ` Arnd Bergmann
2011-04-04 2:49 ` Nicolas Pitre
2011-04-01 15:27 ` Will Deacon
2011-04-01 15:55 ` Arnd Bergmann
2011-04-01 16:39 ` Linus Torvalds
2011-04-03 22:26 ` Benjamin Herrenschmidt
2011-04-05 23:19 ` Linus Walleij
2011-04-06 8:41 ` Catalin Marinas
2011-04-07 1:44 ` Arnd Bergmann
2011-04-01 20:19 ` Nicolas Pitre
2011-04-02 4:38 ` Richard Cochran
2011-04-02 3:27 ` Mark Brown
2011-04-06 6:11 ` Barry Song
2011-04-06 7:31 ` Bryan Wu
2011-03-31 21:40 ` Thomas Gleixner
2011-03-31 17:56 ` Nicolas Pitre
2011-03-31 18:34 ` Thomas Gleixner
2011-03-31 19:02 ` Linus Torvalds
2011-03-31 8:09 ` Russell King - ARM Linux
2011-03-31 10:49 ` Felipe Balbi
2011-03-31 18:00 ` Alexander Holler
2011-03-31 5:45 ` Geert Uytterhoeven
2011-03-31 7:21 ` Nicolas Pitre
2011-03-30 22:08 ` Tony Lindgren
2011-03-30 21:10 ` Thomas Gleixner
2011-03-30 21:54 ` Tony Lindgren
2011-03-30 22:25 ` Thomas Gleixner
2011-03-30 22:45 ` Tony Lindgren
2011-03-30 22:56 ` Thomas Gleixner
2011-04-01 1:42 ` Mark Brown
2011-03-30 22:38 ` Paul E. McKenney
2011-03-30 22:47 ` Tony Lindgren
2011-03-30 23:13 ` Paul E. McKenney
2011-03-30 23:14 ` Thomas Gleixner
2011-03-30 23:28 ` Tony Lindgren
2011-03-31 11:00 ` Artem Bityutskiy
2011-03-31 13:54 ` Arnd Bergmann
2011-03-30 21:44 ` Tony Lindgren
2011-03-30 22:20 ` Linus Torvalds
2011-03-30 22:39 ` Tony Lindgren
2011-03-31 0:15 ` Russell King - ARM Linux
2011-03-31 0:55 ` Linus Torvalds
2011-03-31 1:15 ` Bill Gatliff
2011-03-31 1:37 ` Linus Torvalds
2011-03-31 1:44 ` Bill Gatliff
2011-03-31 1:56 ` Linus Torvalds
2011-03-31 2:20 ` Bill Gatliff
2011-03-31 3:24 ` Linus Torvalds
2011-03-31 6:42 ` Olof Johansson
2011-03-31 6:56 ` David Brown
2011-03-31 11:27 ` Felipe Balbi
2011-03-31 13:39 ` Thomas Gleixner
2011-03-31 4:09 ` Nicolas Pitre
2011-03-31 10:11 ` Thomas Gleixner
2011-03-30 21:07 ` Russell King - ARM Linux
2011-03-30 22:14 ` Tony Lindgren
2011-04-01 1:17 ` Mark Brown
2011-04-01 14:17 ` Arnd Bergmann
2011-03-18 3:02 ` Linus Torvalds
2011-03-18 7:09 ` Tony Lindgren
2011-03-18 8:06 ` Ohad Ben-Cohen
2011-03-18 23:43 ` Tony Lindgren
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=20110318111319.GB27124@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).