linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: thomas.petazzoni@free-electrons.com (Thomas Petazzoni)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL V3 1/5] ARM: Kirkwood: address decoding change for v3.7
Date: Sat, 22 Sep 2012 10:20:41 +0200	[thread overview]
Message-ID: <20120922102041.5ef27c5b@skate> (raw)
In-Reply-To: <20120922052904.GC32245@quad.lixom.net>

Dear Olof Johansson,

On Fri, 21 Sep 2012 22:29:04 -0700, Olof Johansson wrote:

> This branch has pretty massive merge conflicts with cleanup/io-pci
> and other branches, in particular due to the large number of
> conflicting cleanup patches.
> 
> It'd be better to focus on just the address decoding pieces in this
> branch, and move the cleanups to a separate branch. Given the state
> of affairs w.r.t. conflicts for the cleanups, saving those for 3.8
> might be a better idea.
> 
> I mentioned in one of the other comments to a patch in this series
> that I was going to pull this in as staging/* and get linux-next
> coverage, but these conflicts are more than what I want to deal with
> now -- so I'll hold off pulling these in after all.

This is really surprising. Those cleanups were explicitly requested by
Arnd Bergmann during the review process of my address decoding patch
set. The earlier version of this patch set was only doing address
decoding changes, not the IOMEM() cleanup. And Arnd requested the
IOMEM() cleanup to be done as a pre-requisite to the address decoding
changes. I've therefore spent two days last week doing these cleanups
and retesting the address decoding changes, and now you're telling us
exactly the opposite of what Arnd said two weeks ago?

I'm sorry but that doesn't really fair here.

Best regards,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

  parent reply	other threads:[~2012-09-22  8:20 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-29  0:11 [GIT PULL] Kirkwood: board changes for v3.7 Jason Cooper
2012-09-05  4:34 ` Olof Johansson
2012-09-05 23:44   ` Jason Cooper
2012-09-05 23:58     ` Olof Johansson
2012-09-10  5:31   ` Jason Cooper
2012-09-10  5:40 ` [GIT PULL V2] ARM: cache-l2x0 for rmk's tree Jason Cooper
2012-09-10  5:48 ` [GIT PULL V2 1/4] ARM: Kirkwood: DT bindings for v3.7 Jason Cooper
2012-09-13  5:30   ` Olof Johansson
2012-09-18 17:24     ` Jason Cooper
2012-09-19 13:59       ` Arnd Bergmann
2012-09-10  5:57 ` [GIT PULL V2 2/4] ARM: Kirkwood: boards " Jason Cooper
2012-09-10  6:03 ` [GIT PULL V2 3/4] ARM: Kirkwood: cleanup " Jason Cooper
2012-09-10  6:07 ` [GIT PULL V2 4/4] ARM: Kirkwood: defconfig changes " Jason Cooper
2012-09-21 19:41 ` [GIT PULL V3 1/5] ARM: Kirkwood: address decoding change " Jason Cooper
2012-09-22  5:29   ` Olof Johansson
2012-09-22  7:30     ` Arnd Bergmann
2012-09-22  8:20     ` Thomas Petazzoni [this message]
2012-09-21 19:46 ` [GIT PULL V3 2/5] ARM: Kirkwood: DT changes " Jason Cooper
2012-09-22  5:11   ` Olof Johansson
2012-09-22 13:21     ` Jason Cooper
2012-09-21 19:48 ` [GIT PULL V3 3/5] ARM: Kirkwood: board " Jason Cooper
2012-09-21 19:57 ` [GIT PULL V3 4/5] ARM: Kirkwood: cleanup " Jason Cooper
2012-09-22  1:48   ` [GIT PULL V4 4a/5] " Jason Cooper
2012-09-22  1:53   ` [GIT PULL V4 4b/5] ARM: Kirkwood: platform_data " Jason Cooper
2012-09-22  5:17   ` [GIT PULL V3 4/5] ARM: Kirkwood: cleanup " Olof Johansson
2012-09-22 13:31     ` Jason Cooper
2012-09-21 19:58 ` [GIT PULL V3 5/5] ARM: Kirkwood: defconfig changes " Jason Cooper

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=20120922102041.5ef27c5b@skate \
    --to=thomas.petazzoni@free-electrons.com \
    --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).