From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] debug macro changes for 2.6.36
Date: Fri, 30 Jul 2010 09:14:19 +0100 [thread overview]
Message-ID: <20100730081419.GA3208@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <1280474636.27902.1.camel@pororo.lan>
On Fri, Jul 30, 2010 at 03:23:56PM +0800, Jeremy Kerr wrote:
> Hi Russell,
>
> > No. This change is far too big to come via git and will cause lots of
> > conflicts. I'm not fixing those conflicts when there's a better way
> > of handling this kind of change. There's also the matter of new platform
> > support which your patch based approach will miss.
> >
> > What I said about a week ago is that I wanted to do the removal of
> > .phys_io/.io_pg_offst via a script, which'll ensure that we hit
> > everything that's been merged for the next merge window.
>
> OK, but how do you want me to submit this? Provide the other three
> patches, plus a script to remove the machine_desc fields?
This is what I said eight days ago:
| BTW, this may cause lots of conflicts from SFR when the follow-on patch
| which deletes the initializers is merged. So rather than keeping this
| separate, it probably makes more sense for this patch to be merged into
| my tree now.
|
| ...
|
| BTW, it'd probably make more sense to do this as a script, something
| like this (untested):
|
| grep -rl MACHINE_START arch/arm | xargs --no-run-if-empty \
| sed -i '/MACHINE_START/,/MACHINE_END/ { /\.(phys_io|io_pg_offst)/d }'
|
| as over time the number of boards, etc, will change, and there's already
| context changes with these patches caused by the memblock stuff.
My intention was to have your patch merged - as patches - into an
appropriate place in my tree, and then just before the merge window
run that script to remove all the references to phys_io/io_pg_offst,
and finally, some time later, the members from the structure.
next prev parent reply other threads:[~2010-07-30 8:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-30 4:58 [GIT PULL] debug macro changes for 2.6.36 Jeremy Kerr
2010-07-30 7:18 ` Russell King - ARM Linux
2010-07-30 7:23 ` Jeremy Kerr
2010-07-30 8:14 ` Russell King - ARM Linux [this message]
2010-07-30 9:00 ` Jeremy Kerr
2010-07-31 1:46 ` Nicolas Pitre
2010-07-31 9:28 ` Russell King - ARM Linux
2010-08-03 9:40 ` 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=20100730081419.GA3208@n2100.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--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