From: Paul Mundt <lethal@linux-sh.org>
To: linux-sh@vger.kernel.org
Subject: Re: [PATCH 00/17] sh and mach-shmobile struct sh_clk_ops rename
Date: Tue, 06 Mar 2012 03:32:20 +0000 [thread overview]
Message-ID: <20120306033219.GA1828@linux-sh.org> (raw)
In-Reply-To: <20120229131605.29154.8330.sendpatchset@w520>
On Mon, Mar 05, 2012 at 09:56:34PM +0100, Rafael J. Wysocki wrote:
> On Wednesday, February 29, 2012, Magnus Damm wrote:
> > sh and mach-shmobile struct sh_clk_ops rename
>
> Well, this is a hard one, because it has a potential to create many
> dependencies and I think some other patchsets already posted depend on it
> right?
>
> I'd handle that by creating a separate branch, based on the Linus' current,
> that will contain all of the patches in the $subject series and may be
> merged into other branches by me or Paul as needed.
>
> What do you think?
>
There are a few ways to do this I suppose. A common topic branch that we
can pull in to either the SH or ARM side makes sense. We can do the
entire series in one topic branch that gets merged twice and we just make
sure that no rebasing takes place, or we can do patches 1-2 on a common
branch, then 3-8 on an rmobile branch based on the common on, 9-16 on an
sh one, and then leave 17 for the end of the merge window.
Ultimately it depends on how much more work there is going to be done
built on top of this. The sh changes are minimal, so I'm not too worried
about merge conflicts even if we just keep all of these batched together.
next prev parent reply other threads:[~2012-03-06 3:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-29 13:16 [PATCH 00/17] sh and mach-shmobile struct sh_clk_ops rename Magnus Damm
2012-03-05 20:56 ` Rafael J. Wysocki
2012-03-06 3:32 ` Paul Mundt [this message]
2012-03-06 22:24 ` Rafael J. Wysocki
2012-03-07 2:32 ` Paul Mundt
2012-03-07 21:51 ` Rafael J. Wysocki
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=20120306033219.GA1828@linux-sh.org \
--to=lethal@linux-sh.org \
--cc=linux-sh@vger.kernel.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).