From: arnd@arndb•de (Arnd Bergmann)
To: linux-arm-kernel@lists•infradead.org
Subject: [GIT PULL 08/10] Samsung SoC EXYNOS5420 for v3.11
Date: Fri, 21 Jun 2013 09:36:43 +0200 [thread overview]
Message-ID: <201306210936.43780.arnd@arndb.de> (raw)
In-Reply-To: <25bc01ce6e09$b149fc20$13ddf460$%kim@samsung.com>
On Friday 21 June 2013, Kukjin Kim wrote:
> > I'll probably have to create a next/soc2 branch, but
> > will first try to merge the Renesas pull requests, which may have
> > similar problems.
> >
> > If it's possible to rebase this one not to have any dependencies
> > other than the branches merged into next/cleanup and next/soc,
> > I can pull it more easily, as long as I can figure out how
> > to merge it with the common-clk-audio branch.
> >
> I see, BTW as you can see, the common-clk-audio touches all of samsung dt
> files to use '#include' instead of '/include/' so I couldn't remove the
> dependencies :( sorry about that.
>
> If anything is required, please kindly let me know.
No, we'll figure it out.
I think a better solution would have been to do the change do the
dts files in a separate "cleanup" branch and have everything else
that touches those files build on that branch. That way you could
have maintained the flat hierarchy.
I'll just merge it as a 'late' branch for now.
Arnd
next prev parent reply other threads:[~2013-06-21 7:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-18 20:00 [GIT PULL 08/10] Samsung SoC EXYNOS5420 for v3.11 Kukjin Kim
2013-06-20 20:58 ` Arnd Bergmann
2013-06-20 22:58 ` Kukjin Kim
2013-06-21 7:36 ` Arnd Bergmann [this message]
2013-06-21 13:03 ` Arnd Bergmann
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=201306210936.43780.arnd@arndb.de \
--to=arnd@arndb$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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